diff --git a/graphics/libkipi-kde4/Makefile b/graphics/libkipi-kde4/Makefile
index d2e9ecb498be..7fc0e5f639f1 100644
--- a/graphics/libkipi-kde4/Makefile
+++ b/graphics/libkipi-kde4/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	libkipi
-PORTVERSION=	0.1.2
-PORTREVISION=	1
+PORTVERSION=	0.1.5
 CATEGORIES=	graphics kde devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	digikam
+MASTER_SITE_SUBDIR=	kipi
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	KDE Image Plugin Interface
@@ -19,9 +18,13 @@ USE_KDELIBS_VER=3
 USE_GNOME=	gnomehack pkgconfig
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
+USE_GETTEXT=	yes
+INSTALLS_ICONS=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-O2||g;s|-fno-schedule-insns -fno-inline||g' \
+		${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${TOUCH} ${WRKSRC}/libkipi/libkipi/*
 
 .include <bsd.port.mk>
diff --git a/graphics/libkipi-kde4/distinfo b/graphics/libkipi-kde4/distinfo
index f57f7c81645b..0a0e4d3eb082 100644
--- a/graphics/libkipi-kde4/distinfo
+++ b/graphics/libkipi-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (libkipi-0.1.2.tar.bz2) = 2fc68328b1331039861fca6f9354d635
-SHA256 (libkipi-0.1.2.tar.bz2) = 8866e700db8c4c53125ccf614b63ef13ca3f54b86683cbf6dbe53f504ef8b877
-SIZE (libkipi-0.1.2.tar.bz2) = 511251
+MD5 (libkipi-0.1.5.tar.bz2) = aef790871583444cd81bd9dea9c3fd0b
+SHA256 (libkipi-0.1.5.tar.bz2) = 6634c8c17d17b18661f7418e1c45445148c9f9d017344b1b7590d0928c642110
+SIZE (libkipi-0.1.5.tar.bz2) = 602030
diff --git a/graphics/libkipi-kde4/pkg-descr b/graphics/libkipi-kde4/pkg-descr
index 1fa81ba8f65a..686d05714ae3 100644
--- a/graphics/libkipi-kde4/pkg-descr
+++ b/graphics/libkipi-kde4/pkg-descr
@@ -3,3 +3,6 @@ plugin structure for Digikam, KimDaBa, Showimg, and GwenView. Its
 aim is to be able to share image plugins among graphic applications. 
 
 WWW: http://extragear.kde.org/apps/kipi/
+
+- Alex Dupre
+ale@FreeBSD.org
diff --git a/graphics/libkipi-kde4/pkg-plist b/graphics/libkipi-kde4/pkg-plist
index d068a3680ece..06327d210aef 100644
--- a/graphics/libkipi-kde4/pkg-plist
+++ b/graphics/libkipi-kde4/pkg-plist
@@ -17,10 +17,12 @@ lib/libkipi.so
 lib/libkipi.so.1
 libdata/pkgconfig/libkipi.pc
 share/apps/kipi/data/banner_left.png
+share/apps/kipi/data/kipi-plugins_logo.png
 share/icons/hicolor/16x16/apps/kipi.png
 share/icons/hicolor/22x22/apps/kipi.png
 share/icons/hicolor/32x32/apps/kipi.png
 share/icons/hicolor/48x48/apps/kipi.png
+share/locale/ar/LC_MESSAGES/libkipi.mo
 share/locale/br/LC_MESSAGES/libkipi.mo
 share/locale/ca/LC_MESSAGES/libkipi.mo
 share/locale/cs/LC_MESSAGES/libkipi.mo
@@ -34,8 +36,10 @@ share/locale/et/LC_MESSAGES/libkipi.mo
 share/locale/fi/LC_MESSAGES/libkipi.mo
 share/locale/fr/LC_MESSAGES/libkipi.mo
 share/locale/ga/LC_MESSAGES/libkipi.mo
+share/locale/gl/LC_MESSAGES/libkipi.mo
 share/locale/is/LC_MESSAGES/libkipi.mo
 share/locale/it/LC_MESSAGES/libkipi.mo
+share/locale/ja/LC_MESSAGES/libkipi.mo
 share/locale/lt/LC_MESSAGES/libkipi.mo
 share/locale/mt/LC_MESSAGES/libkipi.mo
 share/locale/nb/LC_MESSAGES/libkipi.mo
@@ -44,18 +48,46 @@ share/locale/pa/LC_MESSAGES/libkipi.mo
 share/locale/pl/LC_MESSAGES/libkipi.mo
 share/locale/pt/LC_MESSAGES/libkipi.mo
 share/locale/pt_BR/LC_MESSAGES/libkipi.mo
+share/locale/ru/LC_MESSAGES/libkipi.mo
 share/locale/rw/LC_MESSAGES/libkipi.mo
+share/locale/sk/LC_MESSAGES/libkipi.mo
 share/locale/sl/LC_MESSAGES/libkipi.mo
 share/locale/sr/LC_MESSAGES/libkipi.mo
 share/locale/sr@Latn/LC_MESSAGES/libkipi.mo
-share/locale/sv/LC_MESSAGES/libkipi.mo
 share/locale/ta/LC_MESSAGES/libkipi.mo
 share/locale/tr/LC_MESSAGES/libkipi.mo
+share/locale/uk/LC_MESSAGES/libkipi.mo
 share/locale/zh_CN/LC_MESSAGES/libkipi.mo
 share/servicetypes/kipiplugin.desktop
-@dirrm share/apps/kipi/data
-@dirrm share/apps/kipi
+@dirrmtry share/apps/kipi/data
+@dirrmtry share/apps/kipi
 @dirrm include/libkipi
-@dirrm share/doc/HTML/en/libkipi-0.1.2-apidocs/libkipi/html
-@dirrm share/doc/HTML/en/libkipi-0.1.2-apidocs/libkipi
-@dirrm share/doc/HTML/en/libkipi-0.1.2-apidocs
+@dirrm share/doc/HTML/en/libkipi-0.1.5-apidocs/libkipi/html
+@dirrm share/doc/HTML/en/libkipi-0.1.5-apidocs/libkipi
+@dirrm share/doc/HTML/en/libkipi-0.1.5-apidocs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile
index d2e9ecb498be..7fc0e5f639f1 100644
--- a/graphics/libkipi/Makefile
+++ b/graphics/libkipi/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	libkipi
-PORTVERSION=	0.1.2
-PORTREVISION=	1
+PORTVERSION=	0.1.5
 CATEGORIES=	graphics kde devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	digikam
+MASTER_SITE_SUBDIR=	kipi
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	KDE Image Plugin Interface
@@ -19,9 +18,13 @@ USE_KDELIBS_VER=3
 USE_GNOME=	gnomehack pkgconfig
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
+USE_GETTEXT=	yes
+INSTALLS_ICONS=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-O2||g;s|-fno-schedule-insns -fno-inline||g' \
+		${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${TOUCH} ${WRKSRC}/libkipi/libkipi/*
 
 .include <bsd.port.mk>
diff --git a/graphics/libkipi/distinfo b/graphics/libkipi/distinfo
index f57f7c81645b..0a0e4d3eb082 100644
--- a/graphics/libkipi/distinfo
+++ b/graphics/libkipi/distinfo
@@ -1,3 +1,3 @@
-MD5 (libkipi-0.1.2.tar.bz2) = 2fc68328b1331039861fca6f9354d635
-SHA256 (libkipi-0.1.2.tar.bz2) = 8866e700db8c4c53125ccf614b63ef13ca3f54b86683cbf6dbe53f504ef8b877
-SIZE (libkipi-0.1.2.tar.bz2) = 511251
+MD5 (libkipi-0.1.5.tar.bz2) = aef790871583444cd81bd9dea9c3fd0b
+SHA256 (libkipi-0.1.5.tar.bz2) = 6634c8c17d17b18661f7418e1c45445148c9f9d017344b1b7590d0928c642110
+SIZE (libkipi-0.1.5.tar.bz2) = 602030
diff --git a/graphics/libkipi/pkg-descr b/graphics/libkipi/pkg-descr
index 1fa81ba8f65a..686d05714ae3 100644
--- a/graphics/libkipi/pkg-descr
+++ b/graphics/libkipi/pkg-descr
@@ -3,3 +3,6 @@ plugin structure for Digikam, KimDaBa, Showimg, and GwenView. Its
 aim is to be able to share image plugins among graphic applications. 
 
 WWW: http://extragear.kde.org/apps/kipi/
+
+- Alex Dupre
+ale@FreeBSD.org
diff --git a/graphics/libkipi/pkg-plist b/graphics/libkipi/pkg-plist
index d068a3680ece..06327d210aef 100644
--- a/graphics/libkipi/pkg-plist
+++ b/graphics/libkipi/pkg-plist
@@ -17,10 +17,12 @@ lib/libkipi.so
 lib/libkipi.so.1
 libdata/pkgconfig/libkipi.pc
 share/apps/kipi/data/banner_left.png
+share/apps/kipi/data/kipi-plugins_logo.png
 share/icons/hicolor/16x16/apps/kipi.png
 share/icons/hicolor/22x22/apps/kipi.png
 share/icons/hicolor/32x32/apps/kipi.png
 share/icons/hicolor/48x48/apps/kipi.png
+share/locale/ar/LC_MESSAGES/libkipi.mo
 share/locale/br/LC_MESSAGES/libkipi.mo
 share/locale/ca/LC_MESSAGES/libkipi.mo
 share/locale/cs/LC_MESSAGES/libkipi.mo
@@ -34,8 +36,10 @@ share/locale/et/LC_MESSAGES/libkipi.mo
 share/locale/fi/LC_MESSAGES/libkipi.mo
 share/locale/fr/LC_MESSAGES/libkipi.mo
 share/locale/ga/LC_MESSAGES/libkipi.mo
+share/locale/gl/LC_MESSAGES/libkipi.mo
 share/locale/is/LC_MESSAGES/libkipi.mo
 share/locale/it/LC_MESSAGES/libkipi.mo
+share/locale/ja/LC_MESSAGES/libkipi.mo
 share/locale/lt/LC_MESSAGES/libkipi.mo
 share/locale/mt/LC_MESSAGES/libkipi.mo
 share/locale/nb/LC_MESSAGES/libkipi.mo
@@ -44,18 +48,46 @@ share/locale/pa/LC_MESSAGES/libkipi.mo
 share/locale/pl/LC_MESSAGES/libkipi.mo
 share/locale/pt/LC_MESSAGES/libkipi.mo
 share/locale/pt_BR/LC_MESSAGES/libkipi.mo
+share/locale/ru/LC_MESSAGES/libkipi.mo
 share/locale/rw/LC_MESSAGES/libkipi.mo
+share/locale/sk/LC_MESSAGES/libkipi.mo
 share/locale/sl/LC_MESSAGES/libkipi.mo
 share/locale/sr/LC_MESSAGES/libkipi.mo
 share/locale/sr@Latn/LC_MESSAGES/libkipi.mo
-share/locale/sv/LC_MESSAGES/libkipi.mo
 share/locale/ta/LC_MESSAGES/libkipi.mo
 share/locale/tr/LC_MESSAGES/libkipi.mo
+share/locale/uk/LC_MESSAGES/libkipi.mo
 share/locale/zh_CN/LC_MESSAGES/libkipi.mo
 share/servicetypes/kipiplugin.desktop
-@dirrm share/apps/kipi/data
-@dirrm share/apps/kipi
+@dirrmtry share/apps/kipi/data
+@dirrmtry share/apps/kipi
 @dirrm include/libkipi
-@dirrm share/doc/HTML/en/libkipi-0.1.2-apidocs/libkipi/html
-@dirrm share/doc/HTML/en/libkipi-0.1.2-apidocs/libkipi
-@dirrm share/doc/HTML/en/libkipi-0.1.2-apidocs
+@dirrm share/doc/HTML/en/libkipi-0.1.5-apidocs/libkipi/html
+@dirrm share/doc/HTML/en/libkipi-0.1.5-apidocs/libkipi
+@dirrm share/doc/HTML/en/libkipi-0.1.5-apidocs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN