diff --git a/desktop/pisilinux/history-manager/actions.py b/desktop/pisilinux/history-manager/actions.py
new file mode 100644
index 0000000000..9caaaaf89f
--- /dev/null
+++ b/desktop/pisilinux/history-manager/actions.py
@@ -0,0 +1,15 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 2.
+# See the file http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+
+from pisi.actionsapi import pythonmodules
+from pisi.actionsapi import pisitools
+
+def install():
+    pythonmodules.compile()
+    pythonmodules.install()
+
+    #Remove history-manager from systemsettings, we have a painful crash because of the thread problem of pykde/python
+    #pisitools.remove("/usr/kde/4/share/kde4/services/kcm_historymanager.desktop")
diff --git a/desktop/pisilinux/history-manager/pspec.xml b/desktop/pisilinux/history-manager/pspec.xml
new file mode 100644
index 0000000000..a01a06725d
--- /dev/null
+++ b/desktop/pisilinux/history-manager/pspec.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>history-manager</Name>
+        <Homepage>http://ish.kodzilla.org/pardus/history-manager/</Homepage>
+        <Packager>
+         <Name>Metehan Özbek</Name>
+        <Email>admin@pisilinux.org</Email>
+        </Packager>
+        <License>GPLv2</License>
+        <IsA>app:gui</IsA>
+        <Summary>KDE5 port of History Manager Tool</Summary>
+        <Description>History manager is a graphical interface to pisi snapshot facilities.</Description>
+        <Archive sha1sum="100f05962b829e781fc336b47bf85a210a93859a" type="targz">https://github.com/PisiLinuxNew/history-manager/archive/0.2.8.0-Beta.tar.gz</Archive>
+        <BuildDependencies>
+            <Dependency>python-qt5-devel</Dependency>
+            <Dependency>pypolkit</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
+            <Dependency>python-setuptools</Dependency> 
+            <Dependency>qt5-linguist</Dependency>
+        </BuildDependencies>
+    </Source>
+
+    <Package>
+        <Name>history-manager</Name>
+        <RuntimeDependencies>
+            <Dependency>python-qt5</Dependency>
+            <Dependency>pypolkit</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="library">/usr/lib/python*</Path>
+            <Path fileType="data">/usr/share</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="1">
+            <Date>2016-06-18</Date>
+            <Version>0.2.8.0b</Version>
+            <Comment>First release</Comment>
+            <Name>Metehan Özbek</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+    </History>
+</PISI>
diff --git a/desktop/pisilinux/history-manager/translations.xml b/desktop/pisilinux/history-manager/translations.xml
new file mode 100644
index 0000000000..4b55c577cc
--- /dev/null
+++ b/desktop/pisilinux/history-manager/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" ?>
+<PISI>
+    <Source>
+        <Name>history-manager</Name>
+        <Summary xml:lang="tr">Pisi Geçmiş Yöneticisi uygulaması</Summary>
+        <Description xml:lang="tr">Pisi ile yapılan işlem geçmişini gösterme, sistemi belirli noktaya döndürme, yeni görüntü alma gibi geçmiş yönetimi işlemleri yapmayı sağlayan araç.</Description>
+    </Source>
+</PISI>