diff --git a/jafar-image/Makefile b/jafar-image/Makefile
index bc691cff94ad536231f0165edb1d0022d0f67655..3ec76d82755ec185543fdb8e80d5533de0ca51db 100644
--- a/jafar-image/Makefile
+++ b/jafar-image/Makefile
@@ -1,5 +1,5 @@
 PKGVERSION=		2.1
-PKGREVISION=	1
+PKGREVISION=	2
 DISTNAME=		jafar-image-2.1
 PKGNAME=		jafar-image-2.1
 CATEGORIES=		image
diff --git a/jafar-image/PLIST b/jafar-image/PLIST
index 36a16f875e74fc246d14603db01004762edf01db..0954f7ac676bc131baef8f98cb7d914f8c576329 100644
--- a/jafar-image/PLIST
+++ b/jafar-image/PLIST
@@ -1,20 +1,16 @@
 @comment Wed Jun 15 19:48:43 CEST 2011
 include/jafar/image/Capture.hpp
 include/jafar/image/Image.hpp
-include/jafar/image/Image.hpp~
 include/jafar/image/ImagePreprocessor.hpp
 include/jafar/image/cImage.h
 include/jafar/image/filter.hpp
 include/jafar/image/imageException.hpp
 include/jafar/image/imout.hpp
-include/jafar/image/imout.hpp~
 include/jafar/image/iterator.hpp
 include/jafar/image/lkTracker.hpp
 include/jafar/image/oimstream.hpp
-include/jafar/image/oimstream.hpp~
 include/jafar/image/pyramid.hpp
 include/jafar/image/roi.hpp
-include/jafar/image/roi.hpp~
 lib/libjafar-image.so
 lib/libjafar-image.so.${PKGVERSION}
 lib/libjafar-image.so.2
diff --git a/jafar-image/distinfo b/jafar-image/distinfo
index 5c37a042dc72e94065772a3df361f99ae4c3c841..5c0a4df866b93bb72d723becfef343a4121976bb 100644
--- a/jafar-image/distinfo
+++ b/jafar-image/distinfo
@@ -2,3 +2,4 @@ SHA1 (jafar-image-2.1.tar.gz) = ac650ba22f4d1004d1b8f0d6eac863f9e4bdbf11
 RMD160 (jafar-image-2.1.tar.gz) = 55112939abd8c40a195699d35c72271367323f05
 Size (jafar-image-2.1.tar.gz) = 148533 bytes
 SHA1 (patch-aa) = a73cb4873d12f264141b99116fbb412af0875e91
+SHA1 (patch-ab) = 9a132c8d6fb5dd969ab5eb21b1047435932bb98a
diff --git a/jafar-image/patches/patch-ab b/jafar-image/patches/patch-ab
new file mode 100644
index 0000000000000000000000000000000000000000..aa6c5b824d992df40881dec4a987e4f4aa266f86
--- /dev/null
+++ b/jafar-image/patches/patch-ab
@@ -0,0 +1,17 @@
+Improve pattern used to install module_headers (in particular, avoid installing
+.orig files or temporary emacs files)
+
+--- CMakeLists.txt.orig	2011-12-28 14:20:11.679766922 +0100
++++ CMakeLists.txt	2011-12-28 14:26:36.143776744 +0100
+@@ -110,7 +110,10 @@
+ 
+ 
+ # add module headers
+-file(GLOB module_headers ${jafar-image_SOURCE_DIR}/include/image/*.h*)
++file(GLOB module_h ${jafar-image_SOURCE_DIR}/include/image/*.h)
++file(GLOB module_hh ${jafar-image_SOURCE_DIR}/include/image/*.hh)
++file(GLOB module_hpp ${jafar-image_SOURCE_DIR}/include/image/*.hpp)
++set(module_headers "${module_h};${module_hh};${module_hpp}")
+ # add sources
+ file(GLOB module_sources ${jafar-image_SOURCE_DIR}/src/*.cpp)
+ #remove jafarConfig.h from included headers