diff --git a/dosfstools-3.0.28.tar.gz b/dosfstools-3.0.28.tar.gz
deleted file mode 100644
index 3ebc6a0..0000000
--- a/dosfstools-3.0.28.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6e6e76e9f923e5fca47e872599ff1e932b0248ce58fcdc62d64005b4c8ae097b
-size 104526
diff --git a/dosfstools-3.0.28.tar.gz.sig b/dosfstools-3.0.28.tar.gz.sig
deleted file mode 100644
index d9b8bdc..0000000
Binary files a/dosfstools-3.0.28.tar.gz.sig and /dev/null differ
diff --git a/dosfstools-4.0.tar.gz b/dosfstools-4.0.tar.gz
new file mode 100644
index 0000000..2094b36
--- /dev/null
+++ b/dosfstools-4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25809c30403c9a945ae34827ec75df32ff55017415a720864fefccc8c8f9991f
+size 209587
diff --git a/dosfstools-4.0.tar.gz.sig b/dosfstools-4.0.tar.gz.sig
new file mode 100644
index 0000000..1502acc
Binary files /dev/null and b/dosfstools-4.0.tar.gz.sig differ
diff --git a/dosfstools-suse-dirs.patch b/dosfstools-suse-dirs.patch
deleted file mode 100644
index 4f6ab33..0000000
--- a/dosfstools-suse-dirs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: dosfstools-3.0.28/Makefile
-===================================================================
---- dosfstools-3.0.28.orig/Makefile
-+++ dosfstools-3.0.28/Makefile
-@@ -22,9 +22,9 @@ SHELL := sh -e
- LANGUAGES = $(shell cd manpages/po && ls)
- 
- DESTDIR =
--PREFIX = /usr/local
--SBINDIR = $(PREFIX)/sbin
--DOCDIR = $(PREFIX)/share/doc
-+PREFIX = /usr
-+SBINDIR = /sbin
-+DOCDIR = $(PREFIX)/share/doc/packages
- MANDIR = $(PREFIX)/share/man
- 
- #OPTFLAGS = -O2 -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
diff --git a/dosfstools.changes b/dosfstools.changes
index 1160c0e..ab71f69 100644
--- a/dosfstools.changes
+++ b/dosfstools.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sat May  7 08:49:02 UTC 2016 - mpluskal@suse.com
+
+- Update to 4.0
+  * Switch build system to autotools.
+  * Fixed data corruption errors in fsck.fat Writing to the third 
+    to last cluster on FAT12 with an odd number of clusters would 
+    corrupt the following cluster.
+  * The automatic alignment of data clusters that was added in 
+    3.0.8 and broken for FAT32 starting with 3.0.20 has been 
+    reinstated.
+- Small spec file cleanup
+- Drop no longer needed dosfstools-suse-dirs.patch
+
 -------------------------------------------------------------------
 Wed Jun  3 12:56:32 UTC 2015 - mpluskal@suse.com
 
diff --git a/dosfstools.spec b/dosfstools.spec
index ac61144..f1facfa 100644
--- a/dosfstools.spec
+++ b/dosfstools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dosfstools
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,36 +17,39 @@
 
 
 Name:           dosfstools
-Version:        3.0.28
+Version:        4.0
 Release:        0
 Summary:        Utilities for Making and Checking MS-DOS FAT File Systems on Linux
 License:        GPL-3.0+
 Group:          System/Filesystems
 Url:            https://github.com/dosfstools/dosfstools
-#Git-Clone:	git://daniel-baumann.ch/git/software/dosfstools
 Source:         https://github.com/dosfstools/dosfstools/releases/download/v%{version}/dosfstools-%{version}.tar.gz
 Source2:        https://github.com/dosfstools/dosfstools/releases/download/v%{version}/dosfstools-%{version}.tar.gz.sig
 Source3:        %{name}.keyring
-Patch0:         %{name}-suse-dirs.patch
+BuildRequires:  pkgconfig
+# Linking fails with udev enabled
+# BuildRequires:  pkgconfig(libudev)
 Supplements:    filesystem(vfat)
 Provides:       dosfsck
 Provides:       mkdosfs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-The dosfstools package includes the mkdosfs and dosfsck utilities,
-which respectively make and check MS-DOS FAT file systems on hard
-drives or on floppies.
+The dosfstools package includes the mkdosfs and dosfsck utilities, which
+respectively make and check MS-DOS FAT file systems on hard drives or on
+floppies.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-make CC="gcc" OPTFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE %{optflags}" %{?_smp_mflags}
+%configure \
+  --docdir=%{_docdir}/dosfstools \
+  --enable-compat-symlinks
+make %{?_smp_mflags} CFLAGS="%{optflags} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
 %install
-make install DESTDIR=%{buildroot} SBINDIR=%{_sbindir}
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
 #UsrMerge
 mkdir %{buildroot}/sbin
 ln -sf %{_sbindir}/{dosfsck,dosfslabel,mkdosfs,fsck.msdos,mkfs.msdos,fsck.fat,fsck.vfat,mkfs.fat,mkfs.vfat} %{buildroot}/sbin
@@ -54,12 +57,29 @@ ln -sf %{_sbindir}/{dosfsck,dosfslabel,mkdosfs,fsck.msdos,mkfs.msdos,fsck.fat,fs
 
 %files
 %defattr(-,root,root)
-%doc %{_docdir}/%{name}
+%doc %{_docdir}/dosfstools
 #UsrMerge
 /sbin/*
 #EndUsrMerge
-%{_sbindir}/*
-%{_mandir}/man8/*.gz
-%{_mandir}/de/man8/*.gz
+%{_sbindir}/dosfsck
+%{_sbindir}/dosfslabel
+%{_sbindir}/fatlabel
+%{_sbindir}/fsck.fat
+%{_sbindir}/fsck.msdos
+%{_sbindir}/fsck.vfat
+%{_sbindir}/mkdosfs
+%{_sbindir}/mkfs.fat
+%{_sbindir}/mkfs.msdos
+%{_sbindir}/mkfs.vfat
+%{_mandir}/man8/dosfsck.8%{ext_man}
+%{_mandir}/man8/dosfslabel.8%{ext_man}
+%{_mandir}/man8/fatlabel.8%{ext_man}
+%{_mandir}/man8/fsck.fat.8%{ext_man}
+%{_mandir}/man8/fsck.msdos.8%{ext_man}
+%{_mandir}/man8/fsck.vfat.8%{ext_man}
+%{_mandir}/man8/mkdosfs.8%{ext_man}
+%{_mandir}/man8/mkfs.fat.8%{ext_man}
+%{_mandir}/man8/mkfs.msdos.8%{ext_man}
+%{_mandir}/man8/mkfs.vfat.8%{ext_man}
 
 %changelog