diff --git a/0001-Set-fPIC-and-pie-as-default-params-when-building.patch b/0001-Set-fPIC-and-pie-as-default-params-when-building.patch
deleted file mode 100644
index 8cb4d74..0000000
--- a/0001-Set-fPIC-and-pie-as-default-params-when-building.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From add4f4954adc27ad7b2a698a1d3ac0fcd981602a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
-Date: Tue, 5 Jan 2016 11:20:52 +0100
-Subject: [PATCH] Set -fPIC and -pie as default params when building
-
----
- Makefile.am  | 1 +
- configure.ac | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 7c7a866..77f8400 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,5 @@
- ACLOCAL_AMFLAGS = -I m4
-+AM_LDFLAGS = -pie
- 
- BUILT_SOURCES = rquota.h rquota.c rquota_clnt.c
- 
-diff --git a/configure.ac b/configure.ac
-index cb33781..489c281 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [
- # ================
- # Check for cflags
- # ================
--CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
-+CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC"
- AC_ARG_ENABLE([werror],
-     [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])],
-     [enable_werror="$enableval"],
--- 
-2.6.4
-
diff --git a/quota-4.03.tar.gz b/quota-4.03.tar.gz
deleted file mode 100644
index 4ef2854..0000000
--- a/quota-4.03.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e4d3c0312d213d88011a68efd17a8adfadce95b5d54196dea7b9346dadde1151
-size 570022
diff --git a/quota-4.04.tar.gz b/quota-4.04.tar.gz
new file mode 100644
index 0000000..6390309
--- /dev/null
+++ b/quota-4.04.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:735be1887e7f51f54165e778ae43fc859c04e44d88834ecb2f470e91d4ef8edf
+size 577303
diff --git a/quota.changes b/quota.changes
index 3af74b5..fbd1d93 100644
--- a/quota.changes
+++ b/quota.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Mar 10 10:22:03 UTC 2018 - tchvatal@suse.com
+
+- Version update to 4.04:
+  * support for new kernel interface that allows for repquota(8) to work
+    reliably also for XFS or ext4 with quota feature and generally other
+    filesystem where quota files are not available to quota-tools
+  * IPv6 support for rpc.quotad and all other tools.
+  * Tons of various fixes
+- Drop merged patch 0001-Set-fPIC-and-pie-as-default-params-when-building.patch
+
 -------------------------------------------------------------------
 Thu Nov 23 13:41:35 UTC 2017 - rbrown@suse.com
 
diff --git a/quota.spec b/quota.spec
index 556181b..721afe4 100644
--- a/quota.spec
+++ b/quota.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package quota
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -18,27 +18,20 @@
 
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
-  %define _fillupdir /var/adm/fillup-templates
+  %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
-
 Name:           quota
-Version:        4.03
+Version:        4.04
 Release:        0
 Summary:        Disk Quota System
-License:        GPL-2.0 AND BSD-3-Clause
+License:        GPL-2.0-only AND BSD-3-Clause
 Group:          System/Filesystems
 Url:            http://sourceforge.net/projects/linuxquota/
-#Source0:        http://downloads.sourceforge.net/project/linuxquota/quota-tools/%{version}/%{name}-%{version}.tar.gz
-# Tarball repacked, missing subfolder, will be fixed in next release
-Source0:        %{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/project/linuxquota/quota-tools/%{version}/%{name}-%{version}.tar.gz
 Source1:        sysconfig.nfs-quota
 Source2:        quotad.service
 Source3:        quotad_env.sh
-# PATCH-FIX-UPSTREAM Add pic and pie hardening to build
-Patch1:         0001-Set-fPIC-and-pie-as-default-params-when-building.patch
 Patch2:         %{name}-4.01-warnquota.patch
-# needed for Patch1
-BuildRequires:  automake
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  openldap2-devel
 BuildRequires:  pkgconfig
@@ -46,6 +39,7 @@ BuildRequires:  tcpd-devel
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(libnl-3.0) >= 3.1
 BuildRequires:  pkgconfig(libnl-genl-3.0)
+BuildRequires:  pkgconfig(libtirpc)
 BuildRequires:  pkgconfig(systemd)
 
 %description
@@ -70,15 +64,14 @@ The quotad init script, which provides quota support on NFS mounts.
 
 %prep
 %setup -q
-%patch1 -p1
 %patch2
 
 %build
-autoreconf -fvi
 %configure \
     --docdir=%{_docdir}/%{name} \
     --disable-silent-rules \
     --enable-ldapmail \
+    --enable-rpc \
     --enable-rpcsetquota
 make %{?_smp_mflags}