diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 81182d2..9646eab 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -8,31 +8,34 @@ pkgdesc='The IP Virtual Server administration utility'
 arch=('x86_64')
 url='http://www.linuxvirtualserver.org/software/ipvs.html'
 license=('GPL2')
-depends=('libnl1' 'popt' 'bash')
+depends=('libnl' 'popt' 'bash')
 backup=("etc/$pkgname.conf")
-options=('!makeflags')
 install=$pkgname.install
 source=("https://kernel.org/pub/linux/utils/kernel/ipvsadm/$pkgname-$pkgver.tar."{xz,sign}
+        "ipvsadm-1.31-use-CFLAGS-and-LDFLAGS-environment-variables.patch" # From Fedora
+        "ipvsadm-1.31-Makefile-jobs.patch"
         "$pkgname.systemd"
         "$pkgname.service")
 validpgpkeys=('D893F72888349DB4F170F9A23A554D033B37BCED') # Jesper Dangaard Brouer (RedHat)
 # upstream provides sha256sums of release
 sha256sums=('1a0a5e25b5a1226435d2fb76341656f83a710183aebb0d204db39c0ec3bedfdb'
             'SKIP'
+            '3016d22a0b5d8e735676ea2ab8c9d718fe6254e22fca5cec0a753fe57f34c4f9'
+            '2dcf9e1a4bc52ff31d53d55ffab146e1076b1425b1a203f7045242e596ac1c99'
             '4960ea254128347b03665d51817f29cb643cf2ebca13f5f46649257552ad3ceb'
             '25506d07f412cccab6f2f3a2a1900d5eeda27bc58602d14f44910c4e036b5341')
 
 prepare() {
   cd $pkgname-$pkgver
   # apply patch from the source array (should be a pacman feature)
-  local filename
-  for filename in "${source[@]}"; do
-    if [[ "$filename" =~ \.patch$ ]]; then
-      echo "Applying patch ${filename##*/}"
-      patch -p1 -N -i "$srcdir/${filename##*/}"
-    fi
+  local src
+  for src in "${source[@]}"; do
+    src="${src%%::*}"
+    src="${src##*/}"
+    [[ $src = *.patch ]] || continue
+    echo "Applying patch $src..."
+    patch -Np1 < "../$src"
   done
-  :
 }
 
 build() {
diff --git a/trunk/ipvsadm-1.31-Makefile-jobs.patch b/trunk/ipvsadm-1.31-Makefile-jobs.patch
new file mode 100644
index 0000000..1838257
--- /dev/null
+++ b/trunk/ipvsadm-1.31-Makefile-jobs.patch
@@ -0,0 +1,30 @@
+diff --git a/Makefile b/Makefile
+index 2a1d179..b83ac45 100644
+--- a/Makefile
++++ b/Makefile
+@@ -43,7 +43,6 @@ MAN		= $(BUILD_ROOT)/$(MANDIR)/man8
+ INIT		= $(BUILD_ROOT)/etc/rc.d/init.d
+ MKDIR		= mkdir
+ INSTALL		= install
+-STATIC_LIBS	= libipvs/libipvs.a
+ 
+ ifeq "${ARCH}" "sparc64"
+     CFLAGS += -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow
+@@ -63,7 +62,7 @@ RPMBUILD = $(shell				\
+ 	fi )
+ 
+ OBJS		= ipvsadm.o config_stream.o dynamic_array.o
+-LIBS		= -lpopt
++LIBS		= libipvs/libipvs.a -lpopt
+ ifneq (0,$(HAVE_NL))
+ LIBS		+= $(shell \
+ 		if which pkg-config > /dev/null 2>&1; then \
+@@ -86,7 +85,7 @@ all:            libs ipvsadm
+ libs:
+ 		make -C libipvs
+ 
+-ipvsadm:	$(OBJS) $(STATIC_LIBS)
++ipvsadm:	$(OBJS) $(libs)
+ 		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ install:        all
diff --git a/trunk/ipvsadm-1.31-use-CFLAGS-and-LDFLAGS-environment-variables.patch b/trunk/ipvsadm-1.31-use-CFLAGS-and-LDFLAGS-environment-variables.patch
new file mode 100644
index 0000000..20e0cbe
--- /dev/null
+++ b/trunk/ipvsadm-1.31-use-CFLAGS-and-LDFLAGS-environment-variables.patch
@@ -0,0 +1,52 @@
+From 25d7aa2faef0c36f053ee1ba418fe14022ef6f7c Mon Sep 17 00:00:00 2001
+From: Ryan O'Hara <rohara@redhat.com>
+Date: Tue, 27 Feb 2018 11:49:44 -0600
+Subject: [PATCH] ipvsadm: use CFLAGS and LDFLAGS environment variables
+
+Signed-off-by: Ryan O'Hara <rohara@redhat.com>
+---
+ Makefile         | 6 +++---
+ libipvs/Makefile | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 91a2991..2a1d179 100644
+--- a/Makefile
++++ b/Makefile
+@@ -46,9 +46,9 @@ INSTALL		= install
+ STATIC_LIBS	= libipvs/libipvs.a
+ 
+ ifeq "${ARCH}" "sparc64"
+-    CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow
++    CFLAGS += -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow
+ else
+-    CFLAGS = -Wall -Wunused -Wstrict-prototypes -g
++    CFLAGS += -Wall -Wunused -Wstrict-prototypes -g
+ endif
+ 
+ 
+@@ -87,7 +87,7 @@ libs:
+ 		make -C libipvs
+ 
+ ipvsadm:	$(OBJS) $(STATIC_LIBS)
+-		$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
++		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ install:        all
+ 		if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi
+diff --git a/libipvs/Makefile b/libipvs/Makefile
+index f845c8b..780f3f3 100644
+--- a/libipvs/Makefile
++++ b/libipvs/Makefile
+@@ -1,7 +1,7 @@
+ # Makefile for libipvs
+ 
+ CC		= gcc
+-CFLAGS		= -Wall -Wunused -Wstrict-prototypes -g -fPIC
++CFLAGS		+= -Wall -Wunused -Wstrict-prototypes -g -fPIC
+ ifneq (0,$(HAVE_NL))
+ CFLAGS		+= -DLIBIPVS_USE_NL
+ CFLAGS		+= $(shell \
+-- 
+2.14.3
+