--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -37,17 +37,17 @@
 # ***** END LICENSE BLOCK *****
 
 # A netscape style .mk file for autoconf builds
 
 INCLUDED_AUTOCONF_MK = 1
 USE_AUTOCONF 	= 1
 MOZILLA_CLIENT	= 1
 COMM_BUILD = @COMM_BUILD@
-MOZILLA_SRCDIR = @MOZILLA_SRCDIR@
+MOZILLA_SRCDIR = $(topsrcdir)/mozilla
 MOZILLA_VERSION = @MOZILLA_VERSION@
 MOZILLA_1_9_1_BRANCH = @MOZILLA_1_9_1_BRANCH@
 
 THUNDERBIRD_VERSION	= @THUNDERBIRD_VERSION@
 SUNBIRD_VERSION = @SUNBIRD_VERSION@
 SEAMONKEY_VERSION	= @SEAMONKEY_VERSION@
 
 MOZ_BUILD_APP = @MOZ_BUILD_APP@

--- a/configure.in
+++ b/configure.in
@@ -70,17 +70,16 @@ AC_CANONICAL_SYSTEM
 TARGET_CPU="${target_cpu}"
 TARGET_VENDOR="${target_vendor}"
 TARGET_OS="${target_os}"
 
 dnl comm-central-specific options
 dnl (MOZILLA_SRCDIR would fit here, but is needed to find autoconf tools)
 COMM_BUILD=1
 AC_SUBST(COMM_BUILD)
-AC_SUBST(MOZILLA_SRCDIR)
 dnl export this, so the var is set for mozilla/configure
 MOZCONFIG=`$_AUTOCONF_TOOLS_DIR/mozconfig-find $topsrcdir`
 export MOZCONFIG
 
 MOZ_DEB_TIMESTAMP=`date +"%a, %d  %b %Y %T %z"   2>&1` 
 AC_SUBST(MOZ_DEB_TIMESTAMP)