diff --git a/mail/fdm/Makefile b/mail/fdm/Makefile
index 9777fe0908..0006eefde2 100644
--- a/mail/fdm/Makefile
+++ b/mail/fdm/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fdm
-PKG_VERSION:=1.7
-PKG_RELEASE:=1
+PKG_VERSION:=1.9
+PKG_RELEASE:=2
 PKG_LICENSE:=BSD-2-Clause
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/fdm
-PKG_HASH:=484474094f124ce438c89dfab05519fe7b3aa8c8346d00f790a512ab950cef2a
+PKG_SOURCE:=$(PKG_VERSION).zip
+PKG_SOURCE_URL:=https://github.com/nicm/fdm/archive
+PKG_HASH:=ee08f9133657c8c959b738079c2e4f556cf5cca2daa8343feaf4f07698ad6086
 
 PKG_INSTALL:=1
 
@@ -38,8 +38,13 @@ define Package/fdm/description
   to a pipe, file, maildir, mbox or SMTP server, based on $(if $(CONFIG_FDM_WITH_PCRE),PCRE,POSIX regexp)
 endef
 
+ifdef CONFIG_FDM_WITH_PCRE
+	EXTRA_CFLAGS := -DPCRE
+	EXTRA_LDFLAGS += -lpcre
+endif
+
 MAKE_FLAGS += \
-	PREFIX="/usr"\
+	PREFIX="/usr" \
 	$(if $(CONFIG_FDM_WITH_PCRE),PCRE=1)
 
 define Build/Prepare
@@ -47,6 +52,11 @@ define Build/Prepare
 	$(CP) ./src/compat/* $(PKG_BUILD_DIR)/
 endef
 
+define Build/Configure
+	( cd $(PKG_BUILD_DIR); ./autogen.sh )
+	$(call Build/Configure/Default)
+endef
+
 define Package/fdm/config
 	source "$(SOURCE)/Config.in"
 endef
diff --git a/mail/fdm/patches/003-base64-fix.patch b/mail/fdm/patches/003-base64-fix.patch
new file mode 100644
index 0000000000..2964568b04
--- /dev/null
+++ b/mail/fdm/patches/003-base64-fix.patch
@@ -0,0 +1,15 @@
+Index: fdm-1.9/Makefile.am
+===================================================================
+--- fdm-1.9.orig/Makefile.am
++++ fdm-1.9/Makefile.am
+@@ -107,7 +107,9 @@ dist_fdm_SOURCES = \
+ 	xmalloc.c \
+ 	\
+ 	parse.y \
+-	lex.c
++	lex.c \
++	b64_ntop.c \
++	b64_pton.c
+ 
+ nodist_fdm_SOURCES =
+ if NO_STRLCAT