diff -Nru csh-20110502/debian/changelog csh-20110502/debian/changelog
--- csh-20110502/debian/changelog	2013-10-23 14:38:21.000000000 +0000
+++ csh-20110502/debian/changelog	2014-08-21 22:03:04.000000000 +0000
@@ -1,3 +1,23 @@
+csh (20110502-2.1ubuntu1) utopic; urgency=low
+
+  * Merge from Debian unstable. (LP: #1357955) Remaining changes:
+    - debian/control:
+      + Fix build failure, debhelper cannot handle pmake.
+
+ -- Filip Sohajek <filip.sohajek@gmail.com>  Sun, 17 Aug 2014 16:58:46 +0200
+
+csh (20110502-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  [ gregor herrmann ]
+  * Fix "FTBFS: Makefile:24: *** missing separator.  Stop.":
+    use bmake debhelper addon:
+    - d/control: build-depend on bmake (>= 20130730-2)
+    - d/rules: use bmake buildsystem, update override_dh_auto_{build,clean}
+    (Closes: #718068)
+
+ -- YunQiang Su <syq@debian.org>  Fri, 18 Jul 2014 09:28:44 +0800
+
 csh (20110502-2ubuntu2) trusty; urgency=low
 
   * Fix build failure, debhelper cannot handle pmake. Closes: #718068.
diff -Nru csh-20110502/debian/control csh-20110502/debian/control
--- csh-20110502/debian/control	2011-07-05 12:26:02.000000000 +0000
+++ csh-20110502/debian/control	2014-08-21 21:58:28.000000000 +0000
@@ -1,9 +1,10 @@
 Source: csh
 Section: shells
 Priority: optional
-Maintainer: Matej Vela <vela@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Matej Vela <vela@debian.org>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8), groff, libbsd-dev, pmake
+Build-Depends: debhelper (>= 8), groff, libbsd-dev, bmake (>= 20130730-2)
 
 Package: csh
 Architecture: any
diff -Nru csh-20110502/debian/rules csh-20110502/debian/rules
--- csh-20110502/debian/rules	2013-10-23 14:38:54.000000000 +0000
+++ csh-20110502/debian/rules	2014-08-21 21:52:51.000000000 +0000
@@ -4,15 +4,15 @@
 export CFLAGS := -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) -Wno-error=unused-result
 
 %:
-	dh $@
+	dh $@ --buildsystem=bmake
 
 override_dh_auto_build:
-	pmake
-	cd USD.doc && pmake paper.ps paper.txt
+	dh_auto_build
+	dh_auto_build -- -C USD.doc paper.ps paper.txt
 
 override_dh_auto_clean:
-	pmake cleandir
-	cd USD.doc && pmake cleandir
+	dh_auto_clean
+	dh_auto_clean -- -C USD.doc
 
 override_dh_auto_test:
 	true