diff -Nru elmerfem-6.1.0.svn.5396.dfsg2/debian/changelog elmerfem-6.1.0.svn.5396.dfsg2/debian/changelog
--- elmerfem-6.1.0.svn.5396.dfsg2/debian/changelog	2013-08-06 22:41:59.000000000 +0000
+++ elmerfem-6.1.0.svn.5396.dfsg2/debian/changelog	2013-12-16 13:46:11.000000000 +0000
@@ -1,3 +1,17 @@
+elmerfem (6.1.0.svn.5396.dfsg2-3+rpi2) jessie-staging; urgency=medium
+
+  * Add missing build-depends on libpng12-dev
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Mon, 16 Dec 2013 13:45:53 +0000
+
+elmerfem (6.1.0.svn.5396.dfsg2-3+rpi1) jessie-staging; urgency=low
+
+  * Use automake --add-missing to fix ftbfs while generating autotools stuff
+  * Remove eio/aclocal.m4 and hutiter/aclocal.m4a in clean target to prevent 
+    errors from dpkg-source.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 01 Dec 2013 22:59:42 +0000
+
 elmerfem (6.1.0.svn.5396.dfsg2-3) unstable; urgency=low
 
   [ Boris Pek ]
diff -Nru elmerfem-6.1.0.svn.5396.dfsg2/debian/control elmerfem-6.1.0.svn.5396.dfsg2/debian/control
--- elmerfem-6.1.0.svn.5396.dfsg2/debian/control	2013-08-06 22:41:59.000000000 +0000
+++ elmerfem-6.1.0.svn.5396.dfsg2/debian/control	2013-12-16 13:46:42.000000000 +0000
@@ -12,7 +12,7 @@
  libreadline-dev, libncurses5-dev,
  libx11-dev, tk8.5-dev, tcl8.5-dev, libfreetype6-dev,
  libftgl-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
- libscotchmetis-dev, r-base-core
+ libscotchmetis-dev, r-base-core, libpng12-dev
 Build-Conflicts: libatlas3-base, libatlas-base-dev, gcc-multilib,
  matlab-support
 Vcs-Git: git://git.debian.org/git/debian-science/packages/elmerfem.git
diff -Nru elmerfem-6.1.0.svn.5396.dfsg2/debian/rules elmerfem-6.1.0.svn.5396.dfsg2/debian/rules
--- elmerfem-6.1.0.svn.5396.dfsg2/debian/rules	2013-08-06 22:41:59.000000000 +0000
+++ elmerfem-6.1.0.svn.5396.dfsg2/debian/rules	2013-12-01 23:10:27.000000000 +0000
@@ -71,6 +71,8 @@
 	if [ -d .pc ]; then \
 	  QUILT_PATCHES=debian/patches quilt pop -a && rm -rf .pc; \
 	fi
+	rm -f eio/aclocal.m4
+	rm -f hutiter/aclocal.m4
 	dh_clean
 
 patch:
@@ -93,7 +95,7 @@
 	for missingfile in $(MISSING_FILES); do touch $$missingfile; done
 	for aclocaldir in eio matc elmerparam hutiter meshgen2d fem front elmergrid post; do \
 	  echo Running aclocal/automake in module $$aclocaldir; \
-	  (cd $$aclocaldir && aclocal && automake); \
+	  (cd $$aclocaldir && aclocal && automake --add-missing); \
 	done
 	set -e; for elmermodule in $(ELMER_MODULES); do \
 	  echo; echo CONFIGURING ELMER MODULE $$elmermodule; echo; \