diff -Nru safecat-1.13/debian/changelog safecat-1.13/debian/changelog
--- safecat-1.13/debian/changelog	2012-06-11 03:15:09.000000000 +0000
+++ safecat-1.13/debian/changelog	2016-08-29 21:12:39.000000000 +0000
@@ -1,3 +1,15 @@
+safecat (1.13-3) unstable; urgency=medium
+
+  * Make build reproducible (Closes: #829720)
+  * Bump Standards-Version to 3.9.8
+  * Update packaging copyright years
+  * Add short name to license block in copyright file
+  * Use a non-conflicting regexp separator (Closes: #835713)
+  * Unapply patches from source
+  * Restore conf-(cc|ld) on clean target
+
+ -- Teemu Hukkanen <tjhukkan@iki.fi>  Mon, 29 Aug 2016 23:12:39 +0200
+
 safecat (1.13-2) unstable; urgency=low
 
   * Bump to debhelper compatibility level 9.
diff -Nru safecat-1.13/debian/control safecat-1.13/debian/control
--- safecat-1.13/debian/control	2012-06-11 03:36:32.000000000 +0000
+++ safecat-1.13/debian/control	2016-07-09 19:03:22.000000000 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Teemu Hukkanen <tjhukkan@iki.fi>
 Build-Depends: groff-base, debhelper (>= 9)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.8
 Homepage: http://pobox.com/~lbudney/linux/software/safecat.html
 
 Package: safecat
diff -Nru safecat-1.13/debian/copyright safecat-1.13/debian/copyright
--- safecat-1.13/debian/copyright	2012-06-09 10:13:22.000000000 +0000
+++ safecat-1.13/debian/copyright	2016-07-09 19:11:41.000000000 +0000
@@ -3,7 +3,7 @@
 
 Files: *
 Copyright: 2000-2001, Len Budney <lbudney@pobox.com>
-License:
+License: safecat
  Copying permissions for safecat comes in two parts:
  .
   1. All code written by me is offered under the BSD license. See below
@@ -69,7 +69,7 @@
    EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
-Copyright: 1999-2012, Teemu Hukkanen
+Copyright: 1999-2016, Teemu Hukkanen
 License: BSD-2-clause
  Copyright (c) 1999-2012, Teemu Hukkanen <tjhukkan@iki.fi>
  All rights reserved.
diff -Nru safecat-1.13/debian/patches/05-reproducible-build.patch safecat-1.13/debian/patches/05-reproducible-build.patch
--- safecat-1.13/debian/patches/05-reproducible-build.patch	1970-01-01 00:00:00.000000000 +0000
+++ safecat-1.13/debian/patches/05-reproducible-build.patch	2016-07-09 18:58:00.000000000 +0000
@@ -0,0 +1,15 @@
+Author: Reiner Herrmann <reiner@reiner-h.de>
+Description: Strip build date/time to enable reproducible building
+
+--- a/Makefile
++++ b/Makefile
+@@ -407,8 +407,7 @@
+ version.h: \
+ conf-version
+ 	@echo 'static const char *const version_string="$$Version:' \
+-	`head -1 conf-version` 'built' `date +"%b %d, %Y"` at \
+-	`date +"%H:%M"`'$$";' > version.h
++	`head -1 conf-version` '$$";' > version.h
+ 
+ writefile.o: \
+ compile writefile.c
diff -Nru safecat-1.13/debian/patches/series safecat-1.13/debian/patches/series
--- safecat-1.13/debian/patches/series	2012-06-09 10:03:14.000000000 +0000
+++ safecat-1.13/debian/patches/series	2016-07-09 20:56:21.000000000 +0000
@@ -2,3 +2,4 @@
 02-do-not-mention-procmail.patch
 03-no-RPLINE-DTLINE.patch
 04-manpage-dashes.patch
+05-reproducible-build.patch
diff -Nru safecat-1.13/debian/rules safecat-1.13/debian/rules
--- safecat-1.13/debian/rules	2012-06-11 03:15:03.000000000 +0000
+++ safecat-1.13/debian/rules	2016-08-29 21:09:35.000000000 +0000
@@ -6,9 +6,14 @@
 	dh $@
 
 override_dh_auto_configure:
-	sed -i -e "s/cc \(.*\)/cc ${CFLAGS} \1/" conf-cc
-	sed -i -e "s/cc -s/cc ${LDFLAGS}/" conf-ld
+	sed -i -e "s@^cc \(.*\)@cc ${CFLAGS}@" conf-cc
+	sed -i -e "s@^cc \(.*\)@cc ${LDFLAGS}@" conf-ld
 
 # Skip running make check, as it isn't useful for us
 override_dh_auto_test:
 	true
+
+override_dh_auto_clean:
+	sed -i -e "s@^cc .*@cc -O2@" conf-cc
+	sed -i -e "s@^cc .*@cc -s@" conf-ld
+	dh_auto_clean