diff --git a/hardware/disk/gptfdisk/actions.py b/hardware/disk/gptfdisk/actions.py
new file mode 100644
index 0000000000..ca21e6776c
--- /dev/null
+++ b/hardware/disk/gptfdisk/actions.py
@@ -0,0 +1,23 @@
+#!/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 autotools
+from pisi.actionsapi import pisitools
+
+def build():
+    autotools.make()
+
+def install():
+    pisitools.dobin("cgdisk")
+    pisitools.dobin("fixparts")
+    pisitools.dobin("gdisk")
+    pisitools.dobin("sgdisk")
+
+    pisitools.doman("cgdisk.8")
+    pisitools.doman("fixparts.8")
+    pisitools.doman("gdisk.8")
+    pisitools.doman("sgdisk.8")
+
+    pisitools.dodoc("COPYING", "NEWS", "README")
\ No newline at end of file
diff --git a/hardware/disk/gptfdisk/pspec.xml b/hardware/disk/gptfdisk/pspec.xml
new file mode 100644
index 0000000000..802eacccc5
--- /dev/null
+++ b/hardware/disk/gptfdisk/pspec.xml
@@ -0,0 +1,47 @@
+<PISI>
+    <Source>
+        <Name>gptfdisk</Name>
+        <Homepage>http://www.rodsbooks.com/gdisk/</Homepage>
+        <Packager>
+            <Name>Osman Erkan</Name>
+            <Email>osman.erkan@pisilinux.org</Email>
+        </Packager>
+        <License>GPLv2</License>
+        <IsA>app:console</IsA>
+        <Summary>A text-mode partitioning tool that works on GUID Partition Table (GPT) disks</Summary>
+        <Description>A text-mode partitioning tool that works on GUID Partition Table (GPT) disks</Description>
+        <BuildDependencies>
+            <Dependency>util-linux</Dependency>
+        </BuildDependencies>
+        <Archive sha1sum="97f25db2def1c1939ed3954520bfd9948806d95a" type="targz">http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.0/gptfdisk-1.0.0.tar.gz</Archive>
+    </Source>
+
+    <Package>
+        <Name>gptfdisk</Name>
+        <RuntimeDependencies>
+            <Dependency>util-linux</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="man">/usr/share/man</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="executable">/usr/bin</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="2">
+            <Date>2015-05-01</Date>
+            <Version>1.0.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Yusuf Aydemir</Name>
+            <Email>yusuf.aydemir@pisilinux.org</Email>
+        </Update>
+        <Update release="1">
+            <Date>2014-03-04</Date>
+            <Version>0.8.10</Version>
+            <Comment>First Release</Comment>
+            <Name>Osman Erkan</Name>
+            <Email>osman.erkan@pisilinux.org</Email>
+        </Update>
+    </History>
+</PISI>
diff --git a/hardware/disk/gptfdisk/translations.xml b/hardware/disk/gptfdisk/translations.xml
new file mode 100644
index 0000000000..978aafa489
--- /dev/null
+++ b/hardware/disk/gptfdisk/translations.xml
@@ -0,0 +1,7 @@
+<PISI>
+    <Source>
+        <Name>gptfdisk</Name>
+        <Summary xml:lang="en">A text-mode partitioning tool that works on GUID Partition Table (GPT) disks</Summary>
+        <Description xml:lang="en">A text-mode partitioning tool that works on GUID Partition Table (GPT) disks</Description>
+    </Source>
+</PISI>
\ No newline at end of file