diff --git a/ap/djmount/djmount-0.71-libupnp-1.6.14.diff b/ap/djmount/djmount-0.71-libupnp-1.6.14.diff
new file mode 100644
index 00000000..7c373b12
--- /dev/null
+++ b/ap/djmount/djmount-0.71-libupnp-1.6.14.diff
@@ -0,0 +1,11 @@
+diff -Naur djmount-0.71.orig/djmount/upnp_util.h djmount-0.71/djmount/upnp_util.h
+--- djmount-0.71.orig/djmount/upnp_util.h	2006-08-27 22:12:20.000000000 +0200
++++ djmount-0.71/djmount/upnp_util.h	2012-01-01 16:04:02.864759849 +0100
+@@ -27,6 +27,7 @@
+ #define UPNP_UTIL_H_INCLUDED
+ 
+ 
++#include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
+ 
+ 
diff --git a/ap/djmount/djmount.SlackBuild b/ap/djmount/djmount.SlackBuild
index eefb139b..eb4f0d8f 100755
--- a/ap/djmount/djmount.SlackBuild
+++ b/ap/djmount/djmount.SlackBuild
@@ -24,6 +24,13 @@
 #
 # Latest djmount sourcecode is available at:
 # <http://djmount.sourceforge.net/>.
+#
+# NOTE: The dependency on l/libupnp is only needed on a x86_64 system,
+#       because the bundled version of libupnp has 64-bits issues.
+#       To remove this dependency on a 32-bits system, remove the
+#       --with-external-libupnp flag when calling configure.
+#
+# Depends: l/libupnp
 
 # Source package infos
 NAMESRC=${NAMESRC:-djmount}
@@ -33,7 +40,7 @@ WGET=${WGET:-http://downloads.sourceforge.net/djmount/$ARCHIVE}
 
 # Build infos
 NAMEPKG=${NAMEPKG:-djmount}
-BUILD=${BUILD:-1GGD}
+BUILD=${BUILD:-2GGD}
 ARCH=${ARCH:-$(uname -m | sed 's/^i.86$/i486/;s/^arm.*/arm/')}
 JOBS=${JOBS:-1}
 EXT=${EXT:-txz}
@@ -82,10 +89,12 @@ cd $TMP
 echo "Building $ARCHIVE..."
 tar xf $CWD/$ARCHIVE
 cd $NAME
+patch -p 1 < $CWD/djmount-0.71-libupnp-1.6.14.diff
 CFLAGS=$CPUOPT \
 CXXFLAGS=$CPUOPT \
 ./configure \
-  --prefix=/usr
+  --prefix=/usr \
+  --with-external-libupnp
 make -j $JOBS
 make install-strip DESTDIR=$PKG