diff --git a/cddlib-automake.diff b/cddlib-automake.diff
index 164bde0..56996bd 100644
--- a/cddlib-automake.diff
+++ b/cddlib-automake.diff
@@ -2,15 +2,18 @@ From: Jan Engelhardt <jengelh@medozas.de>
 Date: 2012-08-22 01:01:11.243215671 +0200
 
 automake 1.12 wants AM_PROG_AR.
+Add -no-undefined, required for PE targets and not detrimental on ELF.
 
 ---
- configure.in |    1 +
- 1 file changed, 1 insertion(+)
+ configure.in            |    1 +
+ lib-src-gmp/Makefile.am |    2 +-
+ lib-src/Makefile.am     |    2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
 
-Index: cddlib-094g/configure.in
+Index: cddlib-094h/configure.in
 ===================================================================
---- cddlib-094g.orig/configure.in
-+++ cddlib-094g/configure.in
+--- cddlib-094h.orig/configure.in
++++ cddlib-094h/configure.in
 @@ -8,6 +8,7 @@ dnl Checks for programs.
  AC_PROG_CC
  AM_PROG_CC_C_O
@@ -19,3 +22,23 @@ Index: cddlib-094g/configure.in
  LT_INIT
  
  dnl Checks for libraries.
+Index: cddlib-094h/lib-src-gmp/Makefile.am
+===================================================================
+--- cddlib-094h.orig/lib-src-gmp/Makefile.am
++++ cddlib-094h/lib-src-gmp/Makefile.am
+@@ -25,4 +25,4 @@ cddtypes_f.h \
+ setoper.h
+ 
+ AM_CPPFLAGS = -I$(gmpincludedir) -DGMPRATIONAL
+-AM_LDFLAGS = -version-info 0:0:0
++AM_LDFLAGS = -version-info 0:0:0 -no-undefined
+Index: cddlib-094h/lib-src/Makefile.am
+===================================================================
+--- cddlib-094h.orig/lib-src/Makefile.am
++++ cddlib-094h/lib-src/Makefile.am
+@@ -16,4 +16,4 @@ cddtypes.h \
+ setoper.h
+ 
+ AM_CPPFLAGS = -UGMPRATIONAL
+-AM_LDFLAGS = -version-info 0:0:0
++AM_LDFLAGS = -version-info 0:0:0 -no-undefined
diff --git a/cddlib.changes b/cddlib.changes
index 4148e67..b3d5fb1 100644
--- a/cddlib.changes
+++ b/cddlib.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul  4 08:20:19 UTC 2016 - jengelh@inai.de
+
+- Update cddlib-automake.diff to add -no-undefined
+
 -------------------------------------------------------------------
 Sat Mar 12 21:02:34 UTC 2016 - jengelh@inai.de
 
diff --git a/cddlib.spec b/cddlib.spec
index d7ecfc8..3cd1df2 100644
--- a/cddlib.spec
+++ b/cddlib.spec
@@ -25,7 +25,7 @@ License:        GPL-2.0+
 Group:          Productivity/Scientific/Math
 Url:            http://www.ifor.math.ethz.ch/~fukuda/cdd_home/
 
-Source:         ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/%name-094h.tar.gz
+Source:         ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/cddlib-094h.tar.gz
 Patch1:         cddlib-flags.diff
 Patch2:         cddlib-automake.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -67,13 +67,13 @@ of linear inequalities.
 %patch -P 1 -P 2 -p1
 
 %build
-autoreconf -fi;
+autoreconf -fi
 %configure --enable-shared --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
-make install DESTDIR="%buildroot";
-rm -f "%buildroot/%_libdir"/*.la;
+%make_install
+rm -f "%buildroot/%_libdir"/*.la
 
 %post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig