diff --git a/configure.ac b/configure.ac
index 6784989..3aaaa5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,16 +56,6 @@ LT_PREREQ([2.2])
 LT_INIT
 LT_PATH_LD
 
-with_ldflags=""
-if test "x$lt_cv_prog_gnu_ld" = "xyes"; then
-	CC_CHECK_FLAGS_APPEND([with_ldflags], [LDFLAGS], [\
-				-Wl,--as-needed \
-				-Wl,--gc-sections \
-				-Wl,-z,relro \
-				-Wl,-z,now])
-fi
-AC_SUBST([GNU_LD_FLAGS], $with_ldflags)
-
 AC_CHECK_LIB([m], [round])
 
 PKG_PROG_PKG_CONFIG()
@@ -87,14 +77,7 @@ if test "x$GCC" = "xyes"; then
 				-Wno-unused-parameter \
 				-Wstrict-prototypes \
 				-Wmissing-prototypes \
-				-fvisibility=hidden \
-				-pipe \
-				-fno-strict-aliasing \
-				-ffunction-sections \
-				-fdata-sections \
-				-fno-strict-aliasing \
-				-fdiagnostics-show-option \
-				-fno-common])
+				-fvisibility=hidden ])
 fi
 AC_SUBST([GCC_CFLAGS], $with_cflags)
 
diff --git a/libevdev/Makefile.am b/libevdev/Makefile.am
index fcb434d..69daa2e 100644
--- a/libevdev/Makefile.am
+++ b/libevdev/Makefile.am
@@ -20,7 +20,7 @@ libevdev_la_LDFLAGS = \
         $(AM_LDFLAGS) \
 	-version-info $(LIBEVDEV_LT_VERSION) \
 	-Wl,--version-script="$(srcdir)/libevdev.sym" \
-	$(GNU_LD_FLAGS)
+	$(NULL)
 
 EXTRA_libevdev_la_DEPENDENCIES = $(srcdir)/libevdev.sym