diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index dca1814ad..443ff6141 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -17,6 +17,7 @@ PKG_MD5SUM:=4a371025daf96adb73fa491efdbfef28
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
+PKG_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -40,13 +41,9 @@ define Package/netatalk/conffiles
 /etc/netatalk/afpd.conf
 endef
 
-EXTRA_CFLAGS += -I$(STAGING_DIR)/usr/include
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+TARGET_CFLAGS += -std=c99 -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 TARGET_LDFLAGS += $(LIBRPC)
 
-CONFIGURE_VARS += \
-	CFLAGS="$(TARGET_CFLAGS) -std=gnu99 -DNO_DEBUG "
-
 CONFIGURE_ARGS += \
 	--disable-afs \
 	--enable-hfs \
diff --git a/net/netatalk/patches/001-automake-compat.patch b/net/netatalk/patches/001-automake-compat.patch
new file mode 100644
index 000000000..e56b08650
--- /dev/null
+++ b/net/netatalk/patches/001-automake-compat.patch
@@ -0,0 +1,9 @@
+--- a/macros/iconv.m4
++++ b/macros/iconv.m4
+@@ -114,6 +114,5 @@ int main() {
+ 
+         CFLAGS="$savedcflags"
+         LDFLAGS="$savedldflags"
+-	CPPFLAGS="$saved_CPPFLAGS"
+ 	
+ ])