diff -Nru jfsutils-1.1.15/debian/changelog jfsutils-1.1.15/debian/changelog
--- jfsutils-1.1.15/debian/changelog	2018-10-09 10:38:08.000000000 +0000
+++ jfsutils-1.1.15/debian/changelog	2018-12-11 14:40:40.000000000 +0000
@@ -1,8 +1,10 @@
-jfsutils (1.1.15-3ubuntu1) cosmic; urgency=medium
+jfsutils (1.1.15-4) unstable; urgency=medium
 
-  * Include sysmacros for major() definition from new glibc. Fixes FTBFS.
+  * Include sys/sysmacros.h for recent glibc (closes: #916211).
+  * Update Standards-Version to 4.2.1 .
+  * Update debhelper level to 10 .
 
- -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 09 Oct 2018 11:38:08 +0100
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Tue, 11 Dec 2018 14:40:40 +0000
 
 jfsutils (1.1.15-3) unstable; urgency=low
 
diff -Nru jfsutils-1.1.15/debian/compat jfsutils-1.1.15/debian/compat
--- jfsutils-1.1.15/debian/compat	2016-11-07 17:39:06.000000000 +0000
+++ jfsutils-1.1.15/debian/compat	2018-12-11 14:40:40.000000000 +0000
@@ -1 +1 @@
-9
+10
diff -Nru jfsutils-1.1.15/debian/control jfsutils-1.1.15/debian/control
--- jfsutils-1.1.15/debian/control	2018-10-09 10:38:08.000000000 +0000
+++ jfsutils-1.1.15/debian/control	2018-12-11 14:40:40.000000000 +0000
@@ -1,11 +1,10 @@
 Source: jfsutils
 Section: admin
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.org>
-Build-Depends: cdbs, debhelper (>= 9), uuid-dev
-Standards-Version: 3.9.8
-Homepage: http://jfs.sourceforge.net/
+Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Build-Depends: cdbs, debhelper (>= 11), uuid-dev
+Standards-Version: 4.2.1
+Homepage: https://jfs.sourceforge.net/
 
 Package: jfsutils
 Architecture: any
diff -Nru jfsutils-1.1.15/debian/copyright jfsutils-1.1.15/debian/copyright
--- jfsutils-1.1.15/debian/copyright	2016-11-07 17:39:29.000000000 +0000
+++ jfsutils-1.1.15/debian/copyright	2018-12-11 14:40:40.000000000 +0000
@@ -3,7 +3,7 @@
 Packaging was taken over by Laszlo Boszormenyi (GCS) <gcs@debian.org> on
 Mon, 07 Nov 2016 17:39:29 +0000.
 
-It was downloaded from http://oss.software.ibm.com/developer/opensource/jfs/project/pub/
+It was downloaded from https://oss.software.ibm.com/developer/opensource/jfs/project/pub/
 
 Upstream Authors:
 
diff -Nru jfsutils-1.1.15/debian/patches/add_sysmacros.patch jfsutils-1.1.15/debian/patches/add_sysmacros.patch
--- jfsutils-1.1.15/debian/patches/add_sysmacros.patch	1970-01-01 00:00:00.000000000 +0000
+++ jfsutils-1.1.15/debian/patches/add_sysmacros.patch	2018-12-11 14:40:40.000000000 +0000
@@ -0,0 +1,18 @@
+Description: Include sys/sysmacros.h
+ Mentioned header needed for major() definition.
+Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Last-Update: 2018-12-11
+
+---
+
+--- jfsutils-1.1.15.orig/libfs/devices.c
++++ jfsutils-1.1.15/libfs/devices.c
+@@ -49,6 +49,8 @@
+ #include <sys/disklabel.h>
+ #endif
+ 
++#include <sys/sysmacros.h>
++
+ #include "jfs_types.h"
+ #include "jfs_filsys.h"
+ #include "devices.h"
diff -Nru jfsutils-1.1.15/debian/patches/glibc-ftbfs.patch jfsutils-1.1.15/debian/patches/glibc-ftbfs.patch
--- jfsutils-1.1.15/debian/patches/glibc-ftbfs.patch	2018-10-09 10:38:08.000000000 +0000
+++ jfsutils-1.1.15/debian/patches/glibc-ftbfs.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-Description: Include sysmacros for major() definition from new glibc. Fixes FTBFS.
-Author: Dimitri John Ledkov <xnox@ubuntu.com>
-
-
---- jfsutils-1.1.15.orig/libfs/devices.c
-+++ jfsutils-1.1.15/libfs/devices.c
-@@ -39,6 +39,7 @@
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/ioctl.h>
- #if defined(__DragonFly__)
- #include <machine/param.h>
diff -Nru jfsutils-1.1.15/debian/patches/series jfsutils-1.1.15/debian/patches/series
--- jfsutils-1.1.15/debian/patches/series	2018-10-09 10:38:08.000000000 +0000
+++ jfsutils-1.1.15/debian/patches/series	2018-12-11 14:40:40.000000000 +0000
@@ -2,4 +2,4 @@
 format-security-errors.patch
 sparc-memory-alignment-fix.patch
 fix-mkfs-man-comment.patch
-glibc-ftbfs.patch
+add_sysmacros.patch