diff --git a/editor/bluefish/actions.py b/editor/bluefish/actions.py
index 365c66bebd..759e6ad10a 100644
--- a/editor/bluefish/actions.py
+++ b/editor/bluefish/actions.py
@@ -5,14 +5,13 @@
 # See the file http://www.gnu.org/licenses/gpl.txt
 
 from pisi.actionsapi import autotools
-from pisi.actionsapi import get
 from pisi.actionsapi import pisitools
+from pisi.actionsapi import get
 
-def setup():
-    autotools.autoreconf("-vfi")
+def setup():    
     autotools.configure("--disable-static \
-                                        --disable-update-databases \
-                                        --disable-xml-catalog-update")
+                        --disable-update-databases \
+                        --disable-xml-catalog-update")
 
     pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
@@ -23,3 +22,4 @@ def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
     pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "NEWS", "README", "TODO")
+
diff --git a/editor/bluefish/comar/package.py b/editor/bluefish/comar/package.py
new file mode 100644
index 0000000000..a9238ec07b
--- /dev/null
+++ b/editor/bluefish/comar/package.py
@@ -0,0 +1,18 @@
+#!/usr/bin/python
+
+import os
+
+def postInstall(fromVersion, fromRelease, toVersion, toRelease):
+    os.system("/usr/bin/xmlcatalog  --noout \
+            --add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
+            --add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
+            --add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
+            /etc/xml/catalog")
+
+def preRemove():
+    os.system("/usr/bin/xmlcatalog  --noout \
+            --del 'Bluefish/DTD/Bflang' \
+            --del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
+            --del 'http://bluefish.openoffice.nl/DTD' \
+            /etc/xml/catalog")
+
diff --git a/editor/bluefish/pspec.xml b/editor/bluefish/pspec.xml
index 60ded98249..f3c2d8d0a6 100644
--- a/editor/bluefish/pspec.xml
+++ b/editor/bluefish/pspec.xml
@@ -1,58 +1,95 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>bluefish</Name>
-        <Homepage>http://bluefish.openoffice.nl/index.html</Homepage>
+        <Homepage>http://bluefish.openoffice.nl/</Homepage>
         <Packager>
-            <Name>Pisi Linux Admins</Name>
-            <Email>admin@pisilinux.org</Email>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
         </Packager>
         <License>GPLv3</License>
-        <PartOf>programming.environment</PartOf>
+        <Icon>bluefish</Icon>
         <IsA>app:gui</IsA>
-        <Summary>Bluefish is a powerful editor targeted towards programmers and webdevelopers</Summary>
-        <Description>Bluefish is a powerful editor targeted towards programmers and webdevelopers, with many options to write websites, scripts and programming code. Bluefish supports many programming and markup languages.</Description>
+        <Summary>A powerful editor for experienced web designers and programmers</Summary>
+        <Description>Bluefish is a powerful editor for experienced web designers and programmers. Bluefish supports many programming and markup languages, but it focuses on editing dynamic and interactive websites.</Description>
+        <Archive sha1sum="67743bf05a5affed267027a211673a59dc8908f2" type="tarbz2">http://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.9.tar.bz2</Archive>
         <BuildDependencies>
-            <Dependency>enchant</Dependency>
-            <Dependency>glib2-devel</Dependency>
-            <Dependency>gtk2-devel</Dependency>            
-            <Dependency>libxml2-devel</Dependency>
+            <Dependency>m4</Dependency>
+            <Dependency>python-devel</Dependency>
             <Dependency>intltool</Dependency>
-            <Dependency>gettext-devel</Dependency>
-        </BuildDependencies>        
-        <Archive sha1sum="0f53d85d8fbefeb4baa73bc1c06adf5e21c4ba76" type="targz">mirrors://sourceforge/bluefish/2.2.7/bluefish-2.2.7.tar.gz</Archive>
+            <Dependency>perl</Dependency>
+            <Dependency>automake</Dependency>
+            <Dependency>libtool</Dependency>
+            <Dependency>gtk3-devel</Dependency>
+            <Dependency>atk-devel</Dependency>
+            <Dependency>pango-devel</Dependency>
+            <Dependency>enchant-devel</Dependency>
+            <Dependency>cairo-devel</Dependency>
+            <Dependency>libxml2-devel</Dependency>
+            <Dependency>gdk-pixbuf-devel</Dependency>
+        </BuildDependencies>
     </Source>
+
     <Package>
-        <Name>Bluefish</Name>
+        <Name>bluefish</Name>
         <RuntimeDependencies>
+            <Dependency>gtk3</Dependency>
             <Dependency>atk</Dependency>
-            <Dependency>desktop-file-utils</Dependency>
+            <Dependency>pango</Dependency>
+            <Dependency>enchant</Dependency>
             <Dependency>cairo</Dependency>
             <Dependency>gdk-pixbuf</Dependency>
-            <Dependency>gtk3</Dependency>
-            <Dependency>pango</Dependency>
+            <Dependency>glib2</Dependency>
+            <Dependency>libxml2</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
             <Path fileType="library">/usr/lib</Path>
-            <Path fileType="data">/usr/share</Path>
-            <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="data">/usr/share/applications</Path>
+            <Path fileType="data">/usr/share/bluefish</Path>
+            <Path fileType="doc">/usr/share/doc/bluefish</Path>
+            <Path fileType="data">/usr/share/icons</Path>
             <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="man">/usr/share/man</Path>
+            <Path fileType="data">/usr/share/mime</Path>
+            <Path fileType="data">/usr/share/pixmaps</Path>
+            <Path fileType="data">/usr/share/appdata</Path>
+            <Path fileType="data">/usr/share/xml/bluefish</Path>
         </Files>
+        <Provides>
+            <COMAR script="package.py">System.Package</COMAR>
+        </Provides>
     </Package>
+
     <History>
+        <Update release="4">
+            <Date>2016-12-012</Date>
+            <Version>2.2.9</Version>
+            <Comment>Version bump</Comment>
+            <Name>Stefan Gronewold</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update>
+        <Update release="3">
+            <Date>2014-02-11</Date>
+            <Version>2.2.5</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Yusuf Aydemir</Name>
+            <Email>yusuf.aydemir@pisilinux.org</Email>
+        </Update>
         <Update release="2">
-            <Date>2016-06-09</Date>
-            <Version>2.2.7</Version>
-            <Comment>Release Bump</Comment>
-            <Name>Pisi Linux Community</Name>
-            <Email>admin@pisilinux.org</Email>
+            <Date>2013-03-05</Date>
+            <Version>2.2.4</Version>
+            <Comment>Version bump</Comment>
+            <Name>Ertan Güven</Name>
+            <Email>ertan@pisilinux.org</Email>
         </Update>
         <Update release="1">
-            <Date>2015-10-19</Date>
-            <Version>2.2.7</Version>
+            <Date>2013-01-10</Date>
+            <Version>2.2.3</Version>
             <Comment>First release</Comment>
-            <Name>Stefan Gronewold (groni)</Name>
-            <Email>groni@pisilinux.org</Email>
+            <Name>Osman Erkan</Name>
+            <Email>osman.erkan@pisilinux.org</Email>
         </Update>
     </History>
 </PISI>
diff --git a/editor/bluefish/translations.xml b/editor/bluefish/translations.xml
index aef613b21f..031c73a2a1 100644
--- a/editor/bluefish/translations.xml
+++ b/editor/bluefish/translations.xml
@@ -5,4 +5,4 @@
         <Summary xml:lang="tr">Deneyimli web tasarımcıları ve programcıları için güçlü bir düzenleyici</Summary>
         <Description xml:lang="tr">Bluefish web sayfası tasarım ve hazırlanmasında kullanılan güçlü bir düzenleyicidir.</Description>
     </Source>
-</PISI> 
+</PISI>