diff --git a/dev-cpp/clucene/clucene-2.3.3.4.recipe b/dev-cpp/clucene/clucene-2.3.3.4.recipe
new file mode 100644
index 000000000..761b8aca8
--- /dev/null
+++ b/dev-cpp/clucene/clucene-2.3.3.4.recipe
@@ -0,0 +1,75 @@
+SUMMARY="clucene the open-source, C++ search engine"
+DESCRIPTION="CLucene is a high-performance, scalable, cross platform, \
+full-featured, open-source indexing and searching API. Specifically, CLucene \
+is the guts of a search engine, the hard stuff. You write the easy stuff: the \
+UI and the process of selecting and parsing your data files to pump them into \
+the search engine yourself, and any specialized queries to pull it back for \
+display or further processing.
+
+CLucene is a port of the very popular Java Lucene text search engine API. \
+CLucene aims to be a good alternative to Java Lucene when performance really \
+matters or if you want to stick to good old C++. CLucene is faster than Lucene \
+as it is written in C++, meaning it is being compiled into machine code, has \
+no background GC operations, and requires no any extra setup procedures.
+
+Being written in pure cross-platform C++ code, and utilizing the flexible \
+CMake build system, CLucene can virtually be used for any purpose, on any \
+machine. From PCs running Windows or Linux to Mobile devices. The sky is the \
+limit."
+
+HOMEPAGE="http://clucene.sourceforge.net/"
+LICENSE="Apache v2"
+COPYRIGHT="2003-2006 Ben van Klinken
+	2003-2006 CLucene Team
+	2003-2006 Jos van den Oever"
+SRC_URI="http://downloads.sourceforge.net/clucene/clucene-core-2.3.3.4.tar.gz"
+CHECKSUM_SHA256="ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab"
+SOURCE_DIR="clucene-core-2.3.3.4"
+PATCHES="clucene-2.3.3.4.patchset"
+REVISION="1"
+ARCHITECTURES=""
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	clucene$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku${secondaryArchSuffix}  >= $haikuVersion
+	boost$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libz$secondaryArchSuffix
+	devel:libboost_atomic$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:make
+	cmd:gcc${secondaryArchSuffix}
+	"
+
+BUILD()
+{
+	mkdir -p build_x86
+	cd build_x86
+	cmake -G "Unix Makefiles" .. -DLUCENE_SYS_INCLUDES=$relativeIncludeDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd build_x86
+	make install CMAKE_INSTALL_PREFIX=$prefix
+	prepareInstalledDevelLibs libclucene
+
+	packageEntries devel \
+		$developDir $includeDir
+}
diff --git a/dev-cpp/clucene/clucene.OptionalPackageDescription b/dev-cpp/clucene/clucene.OptionalPackageDescription
deleted file mode 100644
index 9e9f39d28..000000000
--- a/dev-cpp/clucene/clucene.OptionalPackageDescription
+++ /dev/null
@@ -1,6 +0,0 @@
-Package:	CLucene
-Version:	0.9.21
-Copyright:	2003-2006 Ben van Klinken and the CLucene Team
-License:	Apache v2
-License:	GNU LGPL v2.1
-URL:		http://clucene.sourceforge.net
diff --git a/dev-cpp/clucene/patches/clucene-2.3.3.4.patchset b/dev-cpp/clucene/patches/clucene-2.3.3.4.patchset
new file mode 100644
index 000000000..82786a4a4
--- /dev/null
+++ b/dev-cpp/clucene/patches/clucene-2.3.3.4.patchset
@@ -0,0 +1,47 @@
+From bcd1d27ed66d195552d689c322a3bded92bbec5d Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@gmail.com>
+Date: Sat, 8 Nov 2014 17:51:36 +0100
+Subject: Fix include paths.
+
+
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index 5e333a9..33614f7 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -227,17 +227,17 @@ FOREACH(file ${HEADERS})
+ 	file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/core ${apath})
+ 	IF ( NOT aname MATCHES "^_.*" )
+ 		install(FILES ${file} 
+-		        DESTINATION include/${relpath}
++		        DESTINATION develop/headers/${relpath}
+ 		        COMPONENT development)
+ 	ENDIF ( NOT aname MATCHES "^_.*" )
+ ENDFOREACH(file)
+ 
+ #install clucene-shared headers.
+ install(FILES ${clucene-shared_SOURCE_DIR}/CLucene/SharedHeader.h 
+-        DESTINATION include/CLucene 
++        DESTINATION develop/headers/CLucene 
+         COMPONENT development)
+ install(FILES ${clucene-shared_SOURCE_DIR}/CLucene/LuceneThreads.h 
+-        DESTINATION include/CLucene 
++        DESTINATION develop/headers/CLucene 
+         COMPONENT development )
+ 
+ # code for installing an script to help cmake applications determine
+diff --git a/src/ext/CMakeLists.txt b/src/ext/CMakeLists.txt
+index 0ab402e..1055a4b 100644
+--- a/src/ext/CMakeLists.txt
++++ b/src/ext/CMakeLists.txt
+@@ -9,7 +9,7 @@ FOREACH(file ${EXTHEADERS})
+ 	file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/ext/boost ${apath})
+ 	
+ 	install(FILES ${file} 
+-	       DESTINATION "include/CLucene/ext/boost/${relpath}"
++	       DESTINATION "develop/headers/CLucene/ext/boost/${relpath}"
+                COMPONENT development)
+ ENDFOREACH(file)
+ 
+-- 
+1.8.3.4
+