diff --git a/Makefile b/Makefile
new file mode 100644
--- /dev/null
+++ b/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/package.yml b/package.yml
new file mode 100644
--- /dev/null
+++ b/package.yml
@@ -0,0 +1,19 @@
+name       : surfraw
+version    : 2.3.0
+release    : 1
+source     :
+    - https://surfraw.alioth.debian.org/dist/surfraw-2.3.0.tar.gz : ad0420583c8cdd84a31437e59536f8070f15ba4585598d82638b950e5c5c3625
+license    : Public-Domain
+component  : system.utils
+summary    : Surfraw - Shell Users' Revolutionary Front Rage Against the Web
+description: |
+    Surfraw provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power.
+rundeps    :
+    - links
+setup      : |
+    %configure --with-graphical-browser=xdg-open \
+        --with-text-browser=links
+build      : |
+    %make
+install    : |
+    %make_install
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
new file mode 100644
--- /dev/null
+++ b/pspec_x86_64.xml
@@ -0,0 +1,150 @@
+<PISI>
+    <Source>
+        <Name>surfraw</Name>
+        <Packager>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
+        </Packager>
+        <License>Public-Domain</License>
+        <PartOf>system.utils</PartOf>
+        <Summary xml:lang="en">Surfraw - Shell Users&apos; Revolutionary Front Rage Against the Web</Summary>
+        <Description xml:lang="en">Surfraw provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power.
+</Description>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+    </Source>
+    <Package>
+        <Name>surfraw</Name>
+        <Summary xml:lang="en">Surfraw - Shell Users&apos; Revolutionary Front Rage Against the Web</Summary>
+        <Description xml:lang="en">Surfraw provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power.
+</Description>
+        <PartOf>system.utils</PartOf>
+        <Files>
+            <Path fileType="config">/etc/xdg/surfraw/bookmarks</Path>
+            <Path fileType="config">/etc/xdg/surfraw/conf</Path>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="library">/usr/lib64/surfraw/S</Path>
+            <Path fileType="library">/usr/lib64/surfraw/W</Path>
+            <Path fileType="library">/usr/lib64/surfraw/acronym</Path>
+            <Path fileType="library">/usr/lib64/surfraw/ads</Path>
+            <Path fileType="library">/usr/lib64/surfraw/alioth</Path>
+            <Path fileType="library">/usr/lib64/surfraw/amazon</Path>
+            <Path fileType="library">/usr/lib64/surfraw/archpkg</Path>
+            <Path fileType="library">/usr/lib64/surfraw/archwiki</Path>
+            <Path fileType="library">/usr/lib64/surfraw/arxiv</Path>
+            <Path fileType="library">/usr/lib64/surfraw/ask</Path>
+            <Path fileType="library">/usr/lib64/surfraw/aur</Path>
+            <Path fileType="library">/usr/lib64/surfraw/austlii</Path>
+            <Path fileType="library">/usr/lib64/surfraw/bbcnews</Path>
+            <Path fileType="library">/usr/lib64/surfraw/bing</Path>
+            <Path fileType="library">/usr/lib64/surfraw/bookfinder</Path>
+            <Path fileType="library">/usr/lib64/surfraw/bugmenot</Path>
+            <Path fileType="library">/usr/lib64/surfraw/bugzilla</Path>
+            <Path fileType="library">/usr/lib64/surfraw/cia</Path>
+            <Path fileType="library">/usr/lib64/surfraw/cisco</Path>
+            <Path fileType="library">/usr/lib64/surfraw/cite</Path>
+            <Path fileType="library">/usr/lib64/surfraw/cliki</Path>
+            <Path fileType="library">/usr/lib64/surfraw/cnn</Path>
+            <Path fileType="library">/usr/lib64/surfraw/comlaw</Path>
+            <Path fileType="library">/usr/lib64/surfraw/commandlinefu</Path>
+            <Path fileType="library">/usr/lib64/surfraw/ctan</Path>
+            <Path fileType="library">/usr/lib64/surfraw/currency</Path>
+            <Path fileType="library">/usr/lib64/surfraw/cve</Path>
+            <Path fileType="library">/usr/lib64/surfraw/debbugs</Path>
+            <Path fileType="library">/usr/lib64/surfraw/debcodesearch</Path>
+            <Path fileType="library">/usr/lib64/surfraw/debcontents</Path>
+            <Path fileType="library">/usr/lib64/surfraw/deblists</Path>
+            <Path fileType="library">/usr/lib64/surfraw/deblogs</Path>
+            <Path fileType="library">/usr/lib64/surfraw/debpackages</Path>
+            <Path fileType="library">/usr/lib64/surfraw/debpkghome</Path>
+            <Path fileType="library">/usr/lib64/surfraw/debpts</Path>
+            <Path fileType="library">/usr/lib64/surfraw/debsec</Path>
+            <Path fileType="library">/usr/lib64/surfraw/debvcsbrowse</Path>
+            <Path fileType="library">/usr/lib64/surfraw/debwiki</Path>
+            <Path fileType="library">/usr/lib64/surfraw/deja</Path>
+            <Path fileType="library">/usr/lib64/surfraw/discogs</Path>
+            <Path fileType="library">/usr/lib64/surfraw/duckduckgo</Path>
+            <Path fileType="library">/usr/lib64/surfraw/ebay</Path>
+            <Path fileType="library">/usr/lib64/surfraw/etym</Path>
+            <Path fileType="library">/usr/lib64/surfraw/excite</Path>
+            <Path fileType="library">/usr/lib64/surfraw/f5</Path>
+            <Path fileType="library">/usr/lib64/surfraw/finkpkg</Path>
+            <Path fileType="library">/usr/lib64/surfraw/foldoc</Path>
+            <Path fileType="library">/usr/lib64/surfraw/freebsd</Path>
+            <Path fileType="library">/usr/lib64/surfraw/freedb</Path>
+            <Path fileType="library">/usr/lib64/surfraw/freshmeat</Path>
+            <Path fileType="library">/usr/lib64/surfraw/fsfdir</Path>
+            <Path fileType="library">/usr/lib64/surfraw/gcache</Path>
+            <Path fileType="library">/usr/lib64/surfraw/genbugs</Path>
+            <Path fileType="library">/usr/lib64/surfraw/genportage</Path>
+            <Path fileType="library">/usr/lib64/surfraw/github</Path>
+            <Path fileType="library">/usr/lib64/surfraw/gmane</Path>
+            <Path fileType="library">/usr/lib64/surfraw/google</Path>
+            <Path fileType="library">/usr/lib64/surfraw/gutenberg</Path>
+            <Path fileType="library">/usr/lib64/surfraw/imdb</Path>
+            <Path fileType="library">/usr/lib64/surfraw/ixquick</Path>
+            <Path fileType="library">/usr/lib64/surfraw/jamendo</Path>
+            <Path fileType="library">/usr/lib64/surfraw/javasun</Path>
+            <Path fileType="library">/usr/lib64/surfraw/jquery</Path>
+            <Path fileType="library">/usr/lib64/surfraw/l1sp</Path>
+            <Path fileType="library">/usr/lib64/surfraw/lastfm</Path>
+            <Path fileType="library">/usr/lib64/surfraw/leodict</Path>
+            <Path fileType="library">/usr/lib64/surfraw/lsm</Path>
+            <Path fileType="library">/usr/lib64/surfraw/macports</Path>
+            <Path fileType="library">/usr/lib64/surfraw/mathworld</Path>
+            <Path fileType="library">/usr/lib64/surfraw/mdn</Path>
+            <Path fileType="library">/usr/lib64/surfraw/mininova</Path>
+            <Path fileType="library">/usr/lib64/surfraw/musicbrainz</Path>
+            <Path fileType="library">/usr/lib64/surfraw/mysqldoc</Path>
+            <Path fileType="library">/usr/lib64/surfraw/netbsd</Path>
+            <Path fileType="library">/usr/lib64/surfraw/nlab</Path>
+            <Path fileType="library">/usr/lib64/surfraw/ntrs</Path>
+            <Path fileType="library">/usr/lib64/surfraw/openbsd</Path>
+            <Path fileType="library">/usr/lib64/surfraw/oraclesearch</Path>
+            <Path fileType="library">/usr/lib64/surfraw/pgdoc</Path>
+            <Path fileType="library">/usr/lib64/surfraw/pgpkeys</Path>
+            <Path fileType="library">/usr/lib64/surfraw/phpdoc</Path>
+            <Path fileType="library">/usr/lib64/surfraw/pin</Path>
+            <Path fileType="library">/usr/lib64/surfraw/piratebay</Path>
+            <Path fileType="library">/usr/lib64/surfraw/priberam</Path>
+            <Path fileType="library">/usr/lib64/surfraw/pubmed</Path>
+            <Path fileType="library">/usr/lib64/surfraw/rae</Path>
+            <Path fileType="library">/usr/lib64/surfraw/rfc</Path>
+            <Path fileType="library">/usr/lib64/surfraw/scholar</Path>
+            <Path fileType="library">/usr/lib64/surfraw/scpan</Path>
+            <Path fileType="library">/usr/lib64/surfraw/searx</Path>
+            <Path fileType="library">/usr/lib64/surfraw/slashdot</Path>
+            <Path fileType="library">/usr/lib64/surfraw/slinuxdoc</Path>
+            <Path fileType="library">/usr/lib64/surfraw/sourceforge</Path>
+            <Path fileType="library">/usr/lib64/surfraw/springer</Path>
+            <Path fileType="library">/usr/lib64/surfraw/stack</Path>
+            <Path fileType="library">/usr/lib64/surfraw/stockquote</Path>
+            <Path fileType="library">/usr/lib64/surfraw/thesaurus</Path>
+            <Path fileType="library">/usr/lib64/surfraw/translate</Path>
+            <Path fileType="library">/usr/lib64/surfraw/urban</Path>
+            <Path fileType="library">/usr/lib64/surfraw/w3css</Path>
+            <Path fileType="library">/usr/lib64/surfraw/w3html</Path>
+            <Path fileType="library">/usr/lib64/surfraw/w3link</Path>
+            <Path fileType="library">/usr/lib64/surfraw/w3rdf</Path>
+            <Path fileType="library">/usr/lib64/surfraw/wayback</Path>
+            <Path fileType="library">/usr/lib64/surfraw/webster</Path>
+            <Path fileType="library">/usr/lib64/surfraw/wikipedia</Path>
+            <Path fileType="library">/usr/lib64/surfraw/wiktionary</Path>
+            <Path fileType="library">/usr/lib64/surfraw/woffle</Path>
+            <Path fileType="library">/usr/lib64/surfraw/wolfram</Path>
+            <Path fileType="library">/usr/lib64/surfraw/worldwidescience</Path>
+            <Path fileType="library">/usr/lib64/surfraw/yahoo</Path>
+            <Path fileType="library">/usr/lib64/surfraw/yandex</Path>
+            <Path fileType="library">/usr/lib64/surfraw/youtube</Path>
+            <Path fileType="man">/usr/share/man</Path>
+        </Files>
+    </Package>
+    <History>
+        <Update release="1">
+            <Date>2018-04-06</Date>
+            <Version>2.3.0</Version>
+            <Comment>Packaging update</Comment>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
+        </Update>
+    </History>
+</PISI>