diff -Nru tf-4.0s1/debian/changelog tf-4.0s1/debian/changelog
--- tf-4.0s1/debian/changelog	2016-02-06 20:53:48.000000000 +0000
+++ tf-4.0s1/debian/changelog	2017-05-22 14:29:16.000000000 +0000
@@ -1,8 +1,10 @@
-tf (1:4.0s1-19build1) xenial; urgency=medium
+tf (1:4.0s1-20) unstable; urgency=medium
 
-  * No-change rebuild for ncurses6 transition.
+  * Fix reproducible builds by not including output of uname.
+    (Closes: Bug#861133)
+    Thanks to Chris Lamb for noticing and sending the patch.
 
- -- Matthias Klose <doko@ubuntu.com>  Sat, 06 Feb 2016 20:53:48 +0000
+ -- Jan Niehusmann <jan@debian.org>  Mon, 22 May 2017 16:29:16 +0200
 
 tf (1:4.0s1-19) unstable; urgency=medium
 
diff -Nru tf-4.0s1/debian/patches/debian-changes tf-4.0s1/debian/patches/debian-changes
--- tf-4.0s1/debian/patches/debian-changes	2015-05-21 21:33:12.000000000 +0000
+++ tf-4.0s1/debian/patches/debian-changes	2017-05-22 14:29:16.000000000 +0000
@@ -855,16 +855,22 @@
  ### Stripping.
 --- tf-4.0s1.orig/unix/tfconfig
 +++ tf-4.0s1/unix/tfconfig
-@@ -66,7 +66,7 @@ X=''
+@@ -66,8 +66,12 @@ X=''
  if [ -z "$USER" ]; then USER=$LOGNAME; fi
  export USER
  
 -UNAME=`{ uname -s && uname -v && uname -r || uname -a; } 2>/dev/null`
+-echo "#define UNAME     " \"$UNAME\" >&4
 +UNAME=`{ uname -smo; } 2>/dev/null`
- echo "#define UNAME     " \"$UNAME\" >&4
++if test -n "$SOURCE_DATE_EPOCH"; then
++    echo "#define UNAME     \"\"" >&4
++else
++    echo "#define UNAME     " \"$UNAME\" >&4
++fi
  case "$UNAME" in
  "SunOS 5.4")
-@@ -168,18 +168,18 @@ fi
+     echo "#define SUNOS_5_4" >&4
+@@ -168,18 +172,18 @@ fi
  # The cd;pwd is needed to normalize the directory name in case of links, etc.
  
  DIR1=`echo $TF      | sed 's;/[^/]*$;;'`
@@ -888,7 +894,7 @@
  
  BUILDTREE=`cd .. && pwd`
  if echo "${DIR1}/" | egrep "^${BUILDTREE}/" >/dev/null 2>&1 ||
-@@ -482,6 +482,14 @@ else
+@@ -482,6 +486,14 @@ else
      echo "I can't find <pwd.h>.  Filename '~user' expansion won't be supported."
  fi
  
@@ -903,7 +909,7 @@
  ### Figure out how to do varadic args.
  if [ "$STD_C" = "1" ] || [ "$GNU_C" = "1" ]; then
      if echo '#include <stdarg.h>' >test.c; ${CPP} test.c >/dev/null 2>&1; then
-@@ -758,6 +766,12 @@ else
+@@ -758,6 +770,12 @@ else
      echo "/* warning: tfconfig couldn't find connect() */" >&4
  fi