diff --git a/graphics/autopano-sift-c/Makefile b/graphics/autopano-sift-c/Makefile
index d039f0d3566..0039d5327e0 100644
--- a/graphics/autopano-sift-c/Makefile
+++ b/graphics/autopano-sift-c/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2009/04/20 13:35:42 sthen Exp $
+# $OpenBSD: Makefile,v 1.3 2009/05/27 12:59:45 sthen Exp $
 
 COMMENT =		identify control points from groups of overlapping images
 
 DISTNAME =		autopano-sift-C-2.5.0
-PKGNAME =		${DISTNAME:S/C/c/}p0
+PKGNAME =		${DISTNAME:S/C/c/}p1
 
 CATEGORIES =		graphics
 
@@ -32,6 +32,10 @@ CONFIGURE_STYLE =	cmake
 
 NO_REGRESS =		Yes
 
+# dos line-endings in file needing patch
+post-extract:
+	@perl -i -pe 's/\r$$//' ${WRKSRC}/CMakeLists.txt
+
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/CMakeModules/FindPNG.cmake
 
diff --git a/graphics/autopano-sift-c/patches/patch-CMakeLists_txt b/graphics/autopano-sift-c/patches/patch-CMakeLists_txt
new file mode 100644
index 00000000000..cf553651a48
--- /dev/null
+++ b/graphics/autopano-sift-c/patches/patch-CMakeLists_txt
@@ -0,0 +1,14 @@
+$OpenBSD: patch-CMakeLists_txt,v 1.1 2009/05/27 12:59:45 sthen Exp $
+--- CMakeLists.txt.orig	Wed May 27 13:57:42 2009
++++ CMakeLists.txt	Wed May 27 13:57:44 2009
+@@ -146,8 +146,8 @@ endif (WIN32)
+ # documentation
+ FILE(GLOB MAN_PAGES_1 doc/*.1)
+ FILE(GLOB MAN_PAGES_7 doc/*.7)
+-install(FILES ${MAN_PAGES_1} DESTINATION share/man/man1) 
+-install(FILES ${MAN_PAGES_7} DESTINATION share/man/man7) 
++install(FILES ${MAN_PAGES_1} DESTINATION man/man1) 
++install(FILES ${MAN_PAGES_7} DESTINATION man/man7) 
+ 
+ ## Test exectuables.
+ 
diff --git a/graphics/autopano-sift-c/pkg/PLIST b/graphics/autopano-sift-c/pkg/PLIST
index 1e5290c927c..5d9fb0064a2 100644
--- a/graphics/autopano-sift-c/pkg/PLIST
+++ b/graphics/autopano-sift-c/pkg/PLIST
@@ -1,12 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2009/04/19 11:14:41 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.2 2009/05/27 12:59:45 sthen Exp $
 @bin bin/autopano
 bin/autopano-c-complete.sh
 @bin bin/autopano-sift-c
 @bin bin/generatekeys
-share/man/
-share/man/man1/
-@man share/man/man1/autopano-c-complete.1
-@man share/man/man1/autopano.1
-@man share/man/man1/generatekeys.1
-share/man/man7/
-@man share/man/man7/autopano-sift-c.7
+@man man/man1/autopano-c-complete.1
+@man man/man1/autopano.1
+@man man/man1/generatekeys.1
+@man man/man7/autopano-sift-c.7