diff --git a/debian/changelog b/debian/changelog
index 0887e1af..dc572c06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+make-dfsg (4.0-6) unstable; urgency=medium
+
+  * Also create a new binary package, make-guile, which is identical to
+    the make package, but has built in support for Guile a a programming
+    langiage, and adds run time dependencies outside of libc.
+    (Closes: #747615,  #747674).
+  * Bug fix #747615: "Please provide a version with Guile support
+    enabled", thanks to Jose Antonio Ortega Ruiz
+  * Bug fix #747674: "undeterministic build due to missing configure
+    arguments/build-conflicts", thanks to Bernhard R. Link
+
+ -- Manoj Srivastava <srivasta@debian.org>  Sun, 11 May 2014 20:51:24 -0700
+
 make-dfsg (4.0-5) unstable; urgency=low
 
   * When presented with a very very long command line (e.g. WebKit's linking
diff --git a/debian/control b/debian/control
index e51b437e..9793ba31 100644
--- a/debian/control
+++ b/debian/control
@@ -7,11 +7,14 @@ Maintainer: Manoj Srivastava <srivasta@debian.org>
 Standards-Version: 3.9.5.0
 Homepage: http://www.gnu.org/software/make/
 Build-Depends: gettext, po-debconf, debhelper (>= 9.0.0), dh-autoreconf,
-               autoconf, automake | automaken, autopoint, file, pkg-config
+               autoconf, automake | automaken, autopoint, file, pkg-config,
+               guile-2.0-dev
 
 Package: make
 Suggests: make-doc
+Conflicts: make-guile
 Architecture: any
+Replaces: make-guile
 Description: utility for directing compilation
  GNU Make is a utility which controls the generation of executables
  and other target files of a program from the program's source
@@ -23,3 +26,21 @@ Description: utility for directing compilation
  computer programs. Indeed, Make is a general purpose dependency
  solver.
 Depends: ${shlibs:Depends}, ${misc:Depends}
+
+Package: make-guile
+Suggests: make-doc
+Conflicts: make
+Provides: make
+Replaces: make
+Architecture: any
+Description: utility for directing compilation with guile support
+ GNU Make is a utility which controls the generation of executables
+ and other target files of a program from the program's source
+ files. It determines automatically which pieces of a large program
+ need to be (re)created, and issues the commands to (re)create
+ them. Make can be used to organize any task in which targets (files)
+ are to be automatically updated based on input files whenever the
+ corresponding input is newer --- it is not limited to building
+ computer programs. Indeed, Make is a general purpose dependency
+ solver. This variant has built in guile support
+Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/make-guile.docs b/debian/make-guile.docs
new file mode 100644
index 00000000..e8597cea
--- /dev/null
+++ b/debian/make-guile.docs
@@ -0,0 +1,8 @@
+README
+README.customs
+NEWS
+ABOUT-NLS
+AUTHORS
+debian/Explanations
+debian/NEWS.Debian
+debian/README.Debian-Source
diff --git a/debian/make-guile.manpages b/debian/make-guile.manpages
new file mode 100644
index 00000000..f856e260
--- /dev/null
+++ b/debian/make-guile.manpages
@@ -0,0 +1 @@
+make.1
diff --git a/debian/rules b/debian/rules
index 7521bed5..9361af4c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,16 +12,52 @@ install_program = $(INSTALL) -p	   -o root -g root  -m	755
 install_script	= $(INSTALL) -p	   -o root -g root  -m	755
 make_directory	= $(INSTALL) -p -d -o root -g root  -m	755
 PREFIX=/usr
+BUILDDIR_NORMAL = $(SRCTOP)/debian/build-make
+BUILDDIR_GUILE  = $(SRCTOP)/debian/build-make-guile
 
 DPKG_ARCH := dpkg-architecture
 export DEB_HOST_MULTIARCH  := $(shell $(DPKG_ARCH) $(ha) -qDEB_HOST_MULTIARCH)
 
 %:
-	dh $@  --with autoreconf
+	dh $@ --parallel  --with autoreconf
 
 override_dh_auto_configure:
-	ac_cv_lib_util_getloadavg=no dh_auto_configure --    \
-	   --prefix=$(PREFIX) $(confflags)
+ifneq (,$(filter make-guile, $(shell dh_listpackages)))
+	mkdir -p $(BUILDDIR_GUILE)
+	ac_cv_lib_util_getloadavg=no dh_auto_configure --parallel \
+           -B$(BUILDDIR_GUILE) -- --prefix=$(PREFIX) $(confflags) \
+              --with-guile
+endif
+ifneq (,$(filter make, $(shell dh_listpackages)))
+	mkdir -p $(BUILDDIR_NORMAL)
+	ac_cv_lib_util_getloadavg=no dh_auto_configure --parallel  \
+           -B$(BUILDDIR_NORMAL) -- --prefix=$(PREFIX) $(confflags) \
+              --with-guile=no
+endif
+
+override_dh_auto_build:
+ifneq (,$(filter make-guile, $(shell dh_listpackages)))
+	dh_auto_build --parallel -B$(BUILDDIR_GUILE)
+endif
+ifneq (,$(filter make, $(shell dh_listpackages)))
+	dh_auto_build --parallel -B$(BUILDDIR_NORMAL)
+endif
+
+override_dh_auto_test:
+ifneq (,$(filter make-guile, $(shell dh_listpackages)))
+	dh_auto_test --parallel -B$(BUILDDIR_GUILE)
+endif
+ifneq (,$(filter make, $(shell dh_listpackages)))
+	dh_auto_test --parallel -B$(BUILDDIR_NORMAL)
+endif
+
+override_dh_auto_install:
+ifneq (,$(filter make-guile, $(shell dh_listpackages)))
+	dh_auto_install -B$(BUILDDIR_GUILE)  --destdir=debian/make-guile
+endif
+ifneq (,$(filter make, $(shell dh_listpackages)))
+	dh_auto_install -B$(BUILDDIR_NORMAL) --destdir=debian/make
+endif
 
 #Local variables:
 #mode: makefile