diff --git a/hardware/disk/fsarchiver/actions.py b/hardware/disk/fsarchiver/actions.py
new file mode 100644
index 0000000000..3d87e8b2f7
--- /dev/null
+++ b/hardware/disk/fsarchiver/actions.py
@@ -0,0 +1,19 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/licenses/gpl.txt
+
+from pisi.actionsapi import get
+from pisi.actionsapi import autotools
+from pisi.actionsapi import pisitools
+
+def setup():
+    autotools.configure()
+    
+def build():
+    autotools.make()
+
+def install():
+    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "NEWS", "README", "THANKS")
diff --git a/hardware/disk/fsarchiver/pspec.xml b/hardware/disk/fsarchiver/pspec.xml
new file mode 100644
index 0000000000..e94cf54db0
--- /dev/null
+++ b/hardware/disk/fsarchiver/pspec.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>fsarchiver</Name>
+        <Homepage>http://www.fsarchiver.org/Main_Page</Homepage>
+        <Packager>
+            <Name>marcin bojara</Name>
+            <Email>marcin@pisilinux.org</Email>
+        </Packager>
+        <License>GPLv2</License>
+        <IsA>app:console</IsA>
+        <Summary>Safe and flexible file-system backup/deployment tool.</Summary>
+        <Description>FSArchiver is a system tool that allows you to save the contents of a file-system to a compressed archive file.</Description>
+        <Archive sha1sum="99a1c4375e01af4047c4e9778ada146ad6a23aab" type="targz">https://github.com/fdupoux/fsarchiver/releases/download/0.6.21/fsarchiver-0.6.21.tar.gz</Archive>
+        <BuildDependencies>
+            <Dependency>lzo-devel</Dependency>
+            <Dependency>xz-devel</Dependency>
+            <Dependency>zlib-devel</Dependency>
+            <Dependency>bzip2</Dependency>
+            <Dependency>e2fsprogs-devel</Dependency>
+            <Dependency>libgcrypt-devel</Dependency>
+            <Dependency>libutil-linux-devel</Dependency>
+        </BuildDependencies>
+    </Source>
+
+    <Package>
+        <Name>fsarchiver</Name>
+        <RuntimeDependencies>
+            <Dependency>lzo</Dependency>
+            <Dependency>xz</Dependency>
+            <Dependency>zlib</Dependency>
+            <Dependency>bzip2</Dependency>
+            <Dependency>e2fsprogs</Dependency>
+            <Dependency>libgcrypt</Dependency>
+            <Dependency>libutil-linux</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="executable">/usr/sbin</Path>
+            <Path fileType="man">/usr/share/man</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="5">
+            <Date>2016-01-27</Date>
+            <Version>0.6.21</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Stefan Gronewold</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update>
+        <Update release="4">
+            <Date>2014-04-07</Date>
+            <Version>0.6.19</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Serdar Soytetir</Name>
+            <Email>kaptan@pisilinux.org</Email>
+        </Update>
+        <Update release="3">
+            <Date>2014-02-22</Date>
+            <Version>0.6.18</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Alihan Öztürk</Name>
+            <Email>alihan@pisilinux.org</Email>
+        </Update>
+        <Update release="2">
+            <Date>2013-02-28</Date>
+            <Version>0.6.17</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Marcin Bojara</Name>
+            <Email>marcin@pisilinux.org</Email>
+        </Update>
+        <Update release="1">
+            <Date>2012-10-13</Date>
+            <Version>0.6.15</Version>
+            <Comment>First release</Comment>
+            <Name>Marcin Bojara</Name>
+            <Email>marcin@pisilinux.org</Email>
+        </Update>
+    </History>
+</PISI>
diff --git a/hardware/disk/fsarchiver/translations.xml b/hardware/disk/fsarchiver/translations.xml
new file mode 100644
index 0000000000..caab5bc612
--- /dev/null
+++ b/hardware/disk/fsarchiver/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<PISI>
+    <Source>
+        <Name>fsarchiver</Name>
+        <Summary xml:lang="de">Sicherung und Wiederherstellung von Dateisystemen</Summary>
+        <Description xml:lang="de">fsarchiver ist ein Konsolenprogramm zum Sichern und Wiederherstellen von Partitionen und Verzeichnissen.</Description>
+        <Summary xml:lang="pl">Bezpieczne i elastyczne narzędzie do tworzenia kopii zapasowej systemu plików.</Summary>
+        <Description xml:lang="pl">FSArchiver jest narzędziem systemowym, które pozwala na zapisanie zawartości systemu plików w skompresowanym pliku.</Description>
+    </Source>
+</PISI>
+
diff --git a/pisi-index.xml b/pisi-index.xml
index d3c1a6e821..b9b05395a6 100644
--- a/pisi-index.xml
+++ b/pisi-index.xml
@@ -20670,6 +20670,90 @@
             </Update>
         </History>
     </SpecFile>
+    <SpecFile>
+        <Source>
+            <Name>fsarchiver</Name>
+            <Homepage>http://www.fsarchiver.org/Main_Page</Homepage>
+            <Packager>
+                <Name>marcin bojara</Name>
+                <Email>marcin@pisilinux.org</Email>
+            </Packager>
+            <License>GPLv2</License>
+            <IsA>app:console</IsA>
+            <PartOf>hardware.disk</PartOf>
+            <Summary xml:lang="de">Sicherung und Wiederherstellung von Dateisystemen</Summary>
+            <Summary xml:lang="en">Safe and flexible file-system backup/deployment tool.</Summary>
+            <Summary xml:lang="pl">Bezpieczne i elastyczne narzędzie do tworzenia kopii zapasowej systemu plików.</Summary>
+            <Description xml:lang="de">fsarchiver ist ein Konsolenprogramm zum Sichern und Wiederherstellen von Partitionen und Verzeichnissen.</Description>
+            <Description xml:lang="en">FSArchiver is a system tool that allows you to save the contents of a file-system to a compressed archive file.</Description>
+            <Description xml:lang="pl">FSArchiver jest narzędziem systemowym, które pozwala na zapisanie zawartości systemu plików w skompresowanym pliku.</Description>
+            <Archive type="targz" sha1sum="99a1c4375e01af4047c4e9778ada146ad6a23aab">https://github.com/fdupoux/fsarchiver/releases/download/0.6.21/fsarchiver-0.6.21.tar.gz</Archive>
+            <BuildDependencies>
+                <Dependency>lzo-devel</Dependency>
+                <Dependency>xz-devel</Dependency>
+                <Dependency>zlib-devel</Dependency>
+                <Dependency>bzip2</Dependency>
+                <Dependency>e2fsprogs-devel</Dependency>
+                <Dependency>libgcrypt-devel</Dependency>
+                <Dependency>libutil-linux-devel</Dependency>
+            </BuildDependencies>
+            <SourceURI>hardware/disk/fsarchiver/pspec.xml</SourceURI>
+        </Source>
+        <Package>
+            <Name>fsarchiver</Name>
+            <RuntimeDependencies>
+                <Dependency>lzo</Dependency>
+                <Dependency>xz</Dependency>
+                <Dependency>zlib</Dependency>
+                <Dependency>bzip2</Dependency>
+                <Dependency>e2fsprogs</Dependency>
+                <Dependency>libgcrypt</Dependency>
+                <Dependency>libutil-linux</Dependency>
+            </RuntimeDependencies>
+            <Files>
+                <Path fileType="executable">/usr/sbin</Path>
+                <Path fileType="man">/usr/share/man</Path>
+                <Path fileType="doc">/usr/share/doc</Path>
+            </Files>
+        </Package>
+        <History>
+            <Update release="5">
+                <Date>2016-01-27</Date>
+                <Version>0.6.21</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Stefan Gronewold</Name>
+                <Email>groni@pisilinux.org</Email>
+            </Update>
+            <Update release="4">
+                <Date>2014-04-07</Date>
+                <Version>0.6.19</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Serdar Soytetir</Name>
+                <Email>kaptan@pisilinux.org</Email>
+            </Update>
+            <Update release="3">
+                <Date>2014-02-22</Date>
+                <Version>0.6.18</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Alihan Öztürk</Name>
+                <Email>alihan@pisilinux.org</Email>
+            </Update>
+            <Update release="2">
+                <Date>2013-02-28</Date>
+                <Version>0.6.17</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Marcin Bojara</Name>
+                <Email>marcin@pisilinux.org</Email>
+            </Update>
+            <Update release="1">
+                <Date>2012-10-13</Date>
+                <Version>0.6.15</Version>
+                <Comment>First release</Comment>
+                <Name>Marcin Bojara</Name>
+                <Email>marcin@pisilinux.org</Email>
+            </Update>
+        </History>
+    </SpecFile>
     <SpecFile>
         <Source>
             <Name>dmraid</Name>
diff --git a/pisi-index.xml.sha1sum b/pisi-index.xml.sha1sum
index f772057832..28bdba7f9e 100644
--- a/pisi-index.xml.sha1sum
+++ b/pisi-index.xml.sha1sum
@@ -1 +1 @@
-1180a65dab63fdaeaae945f77417489a7bf60ac9
\ No newline at end of file
+74bd177de34aa9577a754a61abb3b591208ca670
\ No newline at end of file
diff --git a/pisi-index.xml.xz b/pisi-index.xml.xz
index 8dd0bc33e2..f6a27450a6 100644
Binary files a/pisi-index.xml.xz and b/pisi-index.xml.xz differ
diff --git a/pisi-index.xml.xz.sha1sum b/pisi-index.xml.xz.sha1sum
index 44cd4398da..a8c23c5d7c 100644
--- a/pisi-index.xml.xz.sha1sum
+++ b/pisi-index.xml.xz.sha1sum
@@ -1 +1 @@
-d240ac43db7ae865b4f862ee71e6ec6110f7bd05
\ No newline at end of file
+f221ccfc925bc05f3b3835fa7294ac5b85b23ddb
\ No newline at end of file