diff --git a/graphics/frei0r/Makefile b/graphics/frei0r/Makefile
index bbd77530ad3e..7d17321e380a 100644
--- a/graphics/frei0r/Makefile
+++ b/graphics/frei0r/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	frei0r
-PORTVERSION=	1.2
+PORTVERSION=	1.2.1
 DISTVERSIONPREFIX=	plugins-
 CATEGORIES=	graphics
-MASTER_SITES=	http://piksel.no/${PORTNAME}/ \
+MASTER_SITES=	http://piksel.no/${PORTNAME}/releases/ \
 		ftp://ftp.dyne.org/${PORTNAME}/releases/ \
 		http://distfiles.macports.org/${PORTNAME}-plugins/
 
@@ -21,10 +21,9 @@ LIB_DEPENDS=	cv.2:${PORTSDIR}/graphics/opencv \
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack pkgconfig
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 MAKE_JOBS_SAFE=	yes
 
-CFLAGS+=	-I${LOCALBASE}/include
-
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
@@ -50,9 +49,12 @@ PLIST_SUB+=	APIDOC="@comment "
 CONFIGURE_ARGS+=--disable-cpuflags
 .endif
 
+post-extract:
+	@${TOUCH} ${WRKSRC}/include/config.h.in
+
 post-patch:
-.if !defined(WITH_APIDOC)
-	@${REINPLACE_CMD} -e '/^SUBDIRS/s| doc||' ${WRKSRC}/Makefile.in
+.if defined(WITH_APIDOC)
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s|include|include doc|' ${WRKSRC}/Makefile.in
 .endif
 	@${REINPLACE_CMD} -e 's|^docsdir.*|docsdir = ${DOCSDIR}|' \
 			  -e '/^install-data-am/s| install-docsDATA||' \
diff --git a/graphics/frei0r/distinfo b/graphics/frei0r/distinfo
index 9e6be550e98e..229fc359f8ca 100644
--- a/graphics/frei0r/distinfo
+++ b/graphics/frei0r/distinfo
@@ -1,3 +1,2 @@
-MD5 (frei0r-plugins-1.2.tar.gz) = 7af2a36c33af2cd3dbd28e3ac79a3645
-SHA256 (frei0r-plugins-1.2.tar.gz) = d8bc193d486c35138dfb4ab4a00f9f34725bfabc2a03f0bb54f04df2c65d692a
-SIZE (frei0r-plugins-1.2.tar.gz) = 1019079
+SHA256 (frei0r-plugins-1.2.1.tar.gz) = 375cd80f03a2bbcecc585487147120952cda99b9d5fe26c0232c233d3525de5b
+SIZE (frei0r-plugins-1.2.1.tar.gz) = 1018783
diff --git a/graphics/frei0r/pkg-plist b/graphics/frei0r/pkg-plist
index 4673b82b6bfa..ac80fcd8b4e3 100644
--- a/graphics/frei0r/pkg-plist
+++ b/graphics/frei0r/pkg-plist
@@ -101,10 +101,10 @@ libdata/pkgconfig/frei0r.pc
 %%APIDOC%%%%DOCSDIR%%/html/bc_s.png
 %%APIDOC%%%%DOCSDIR%%/html/classes.html
 %%APIDOC%%%%DOCSDIR%%/html/closed.png
-%%APIDOC%%%%DOCSDIR%%/html/dir_8172e6efa965a0ce46c3309e91d1b84c.html
-%%APIDOC%%%%DOCSDIR%%/html/dir_8172e6efa965a0ce46c3309e91d1b84c_dep.map
-%%APIDOC%%%%DOCSDIR%%/html/dir_8172e6efa965a0ce46c3309e91d1b84c_dep.md5
-%%APIDOC%%%%DOCSDIR%%/html/dir_8172e6efa965a0ce46c3309e91d1b84c_dep.png
+%%APIDOC%%%%DOCSDIR%%/html/dir_a8bede1800020592fb2480c268d77cfe.html
+%%APIDOC%%%%DOCSDIR%%/html/dir_a8bede1800020592fb2480c268d77cfe_dep.map
+%%APIDOC%%%%DOCSDIR%%/html/dir_a8bede1800020592fb2480c268d77cfe_dep.md5
+%%APIDOC%%%%DOCSDIR%%/html/dir_a8bede1800020592fb2480c268d77cfe_dep.png
 %%APIDOC%%%%DOCSDIR%%/html/dirs.html
 %%APIDOC%%%%DOCSDIR%%/html/doxygen.css
 %%APIDOC%%%%DOCSDIR%%/html/doxygen.png