diff --git a/programming/misc/flann/actions.py b/programming/misc/flann/actions.py
new file mode 100644
index 0000000000..2c011d74de
--- /dev/null
+++ b/programming/misc/flann/actions.py
@@ -0,0 +1,41 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/copyleft/gpl.txt
+
+from pisi.actionsapi import cmaketools
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
+from pisi.actionsapi import get
+
+def setup():
+    shelltools.system("sed -i 's/lib64/lib/g' cmake/flann_utils.cmake")
+    shelltools.system("sed -i '1 i #undef _GLIBCXX_ATOMIC_BUILTINS' src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu")
+    shelltools.system("sed -i '1 i #undef _GLIBCXX_USE_INT128' src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu")
+
+    shelltools.system("sed -i 's|#!/usr/bin/env python|#!/usr/bin/python2|' \
+                              bin/download_checkmd5.py \
+                              bin/run_test.py \
+                              src/python/setup.py.tpl \
+                              test/test_clustering.py \
+                              test/test_index_save.py \
+                              test/test_nn_autotune.py \
+                              test/test_nn_index.py \
+                              test/test_nn.py")
+    shelltools.system('sed -i "s|setup\.py install|setup.py install --root=$pkgdir --optimize=1|" src/python/CMakeLists.txt')
+    cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \
+                          -DCMAKE_INSTALL_PREFIX=/usr \
+                          -DBUILD_MATLAB_BINDINGS=OFF \
+                          -DBUILD_PYTHON_BINDINGS=ON \
+                          -DPYTHON_EXECUTABLE=/usr/bin/python2.7 \
+                          -DNVCC_COMPILER_BINDIR=/usr/bin")
+
+def build():
+    cmaketools.make()
+
+def install():
+    cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
+    pisitools.dosym("libinput.so.5.0.0","/usr/lib/libinput.so.0")
+    
+    #pisitools.dodoc("COPYING", "README")
diff --git a/programming/misc/flann/pspec.xml b/programming/misc/flann/pspec.xml
new file mode 100644
index 0000000000..512e7580d7
--- /dev/null
+++ b/programming/misc/flann/pspec.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>flann</Name>
+        <Homepage>http://www.cs.ubc.ca/research/flann/</Homepage>
+        <Packager>
+            <Name>Osman Erkan</Name>
+            <Email>osman.erkan@pisilinux.org</Email>
+        </Packager>
+        <License>BSD</License>
+        <IsA>library</IsA>
+        <Summary>FLANN is a library for performing fast approximate nearest neighbor searches in high dimensional space.</Summary>
+        <Description>FLANN is a library for performing fast approximate nearest neighbor searches in high dimensional spaces. It contains a collection of algorithms we found to work best for nearest neighbor search and a system for automatically choosing the best algorithm and optimum parameters depending on the dataset.</Description>
+        <Archive sha1sum="e03d9d458757f70f6af1d330ff453e3621550a4f" type="zip">http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.8.4-src.zip</Archive>
+        <BuildDependencies>
+            <Dependency>cmake</Dependency>
+        </BuildDependencies>
+    </Source>
+
+    <Package>
+        <Name>flann</Name>
+        <RuntimeDependencies>
+            <Dependency>libgcc</Dependency>
+            <Dependency>libgomp</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="data">/usr/share/flann</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>flann-devel</Name>
+        <Summary>Development files for flann</Summary>
+        <RuntimeDependencies>
+            <Dependency release="current">flann</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="header">/usr/include</Path>
+            <Path fileType="library">/usr/lib/pkgconfig</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="1">
+            <Date>2015-08-25</Date>
+            <Version>1.8.4</Version>
+            <Comment>First release.</Comment>
+            <Name>Osman Erkan</Name>
+            <Email>osman.erkan@pisilinux.org</Email>
+        </Update>
+    </History>
+</PISI>
\ No newline at end of file
diff --git a/programming/misc/flann/translations.xml b/programming/misc/flann/translations.xml
new file mode 100644
index 0000000000..9031f8145c
--- /dev/null
+++ b/programming/misc/flann/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<PISI>
+    <Source>
+        <Name>flann</Name>
+        <Summary xml:lang="en">FLANN is a library for performing fast approximate nearest neighbor searches in high dimensional space.</Summary>
+        <Description xml:lang="en">FLANN is a library for performing fast approximate nearest neighbor searches in high dimensional spaces. It contains a collection of algorithms we found to work best for nearest neighbor search and a system for automatically choosing the best algorithm and optimum parameters depending on the dataset.</Description>
+    </Source>
+
+    <Package>
+        <Name>flann-devel</Name>
+        <Summary xml:lang="en">Development files for flann</Summary>
+    </Package>
+</PISI>
\ No newline at end of file