diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000000000000000000000000000000000000..11a06b4825122b53c9b0bb9e321ca162d15f26a9
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+fish (2.0.0-0) unstable; urgency=low
+
+ * Initial release of fish 2.0.0.
+
+ -- David Adam <zanchey@ucc.gu.uwa.edu.au> Thu, 19 Jul 2012 23:17:58 +0800
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000000000000000000000000000000000000..45a4fb75db864000d01701c0f7a51864bd4daabf
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000000000000000000000000000000000000..a8c56fe1477886ff150d1d6b04593bd49db1ade6
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,32 @@
+Source: fish
+Section: shells
+Priority: extra
+Maintainer: ridiculous_fish <corydoras@ridiculousfish.com>
+Uploaders: David Adam <zanchey@ucc.gu.uwa.edu.au>, Siteshwar Vashisht <siteshwar@gmail.com>
+Build-Depends: debhelper (>= 8.0.0), libncurses5-dev, autoconf, doxygen, autotools-dev, dh-autoreconf, gettext
+Standards-Version: 3.9.1
+Homepage: http://fishshell.com/
+Vcs-Git: git://github.com/fish-shell/fish-shell.git
+Vcs-Browser: https://github.com/fish-shell/fish-shell
+
+Package: fish
+Architecture: any
+Conflicts: fish
+Depends: ${shlibs:Depends}, ${misc:Depends}, passwd (>= 4.0.3-10), libjs-jquery, bc, gettext-base
+Recommends: python (>=2.6), xsel (>=1.2.0)
+Description: friendly interactive shell
+ Fish is a command-line shell for modern systems, focusing on user-friendliness,
+ sensibility and discoverability in interactive use. The syntax is simple, but
+ not POSIX compliant.
+
+Package: fish-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: fish (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for friendly interactive shell
+ Fish is a command-line shell for modern systems, focusing on user-friendliness,
+ sensibility and discoverability in interactive use. The syntax is simple, but
+ not POSIX compliant.
+ .
+ This package contains the debugging symbols for fish.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000000000000000000000000000000000000..db2a6dcfdc0b865a74fc9712809cb71cf58846be
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,131 @@
+This work was packaged for Debian by David Adam <zanchey@ucc.gu.uwa.edu.au>
+on Thu, 14 Jun 2012 20:33:34 +0800, based on work by James Vega
+<jamessan@jamessan.com>.
+
+It was downloaded from:
+
+ https://github.com/fish-shell/fish-shell
+
+Upstream Authors:
+
+ Axel Liljencrantz
+ ridiculous_fish
+
+Copyright:
+
+ Copyright (C) 2005-2008 Axel Liljencrantz
+ Copyright (C) 2011-2012 ridiculous_fish
+
+License:
+
+Copyright (C) 2005-2008 Axel Liljencrantz
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Fish contains code under the BSD license, namely versions of the
+two functions strlcat and strlcpy, modified for use with wide
+character strings.
+
+ Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+The XSel command, written and copyrighted by Conrad Parker, is
+distributed together with, and used by fish. It is released under the MIT
+license.
+
+ It is Copyright (C) 2001 Conrad Parker <conrad@vergenet.net>
+
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without fee,
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in
+ supporting documentation. No representations are made about the
+ suitability of this software for any purpose. It is provided "as is"
+ without express or implied warranty.
+
+The xdgmime library, written and copyrighted by Red Hat, Inc, is used
+by the mimedb command, which is a part of fish. It is released under
+the LGPL license.
+
+The copyright for the xdgmime-related files belong to the following people
+xdgmime.c
+ Copyright (C) 2003,2004 Red Hat, Inc.
+ Copyright (C) 2003,2004 Jonathan Blandford <jrb@alum.mit.edu>
+
+xdgmime.h
+ Copyright (C) 2003 Red Hat, Inc.
+ Copyright (C) 2003 Jonathan Blandford <jrb@alum.mit.edu>
+
+xdgmimealias.c, xdgmimealias.h
+ Copyright (C) 2004 Red Hat, Inc.
+ Copyright (C) 2004 Matthias Clasen <mclasen@redhat.com>
+
+xdgmimeglob.c, xdgmimeglob.h
+ Copyright (C) 2003 Red Hat, Inc.
+ Copyright (C) 2003 Jonathan Blandford <jrb@alum.mit.edu>
+
+xdgmimeint.c, xdgmimeint.h
+ Copyright (C) 2003 Red Hat, Inc.
+ Copyright (C) 2003 Jonathan Blandford <jrb@alum.mit.edu>
+
+xdgmimemagic.c, xdgmimemagic.h
+ Copyright (C) 2003 Red Hat, Inc.
+ Copyright (C) 2003 Jonathan Blandford <jrb@alum.mit.edu>
+
+xdgmimeparent.c, xdgmimeparent.h
+ Copyright (C) 2004 Red Hat, Inc.
+ Copyright (C) 2004 Matthias Clasen <mclasen@redhat.com>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+Fish contains code from the glibc library, namely the wcstok function
+in fallback.c. This code is licensed under the LGPL.
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+The Debian packaging is:
+
+ Copyright (C) 2005 James Vega <jamessan@jamessan.com>
+ Copyright (C) 2012 David Adam <zanchey@ucc.gu.uwa.edu.au>
+
+and is licensed under the GPL version 2, see above.
diff --git a/debian/fish.doc-base b/debian/fish.doc-base
new file mode 100644
index 0000000000000000000000000000000000000000..630b8563a51b0f4121471b1ec69620c73692f9e2
--- /dev/null
+++ b/debian/fish.doc-base
@@ -0,0 +1,12 @@
+Document: fish
+Title: Debian fish Manual
+Author: Axel Liljencrantz <axel@liljencrantz.se>
+Abstract: This guide documents fish, a shell
+ geared towards interactive use.
+Section: Shells
+
+Format: HTML
+Index: /usr/share/doc/fish/index.html
+Files: /usr/share/doc/fish/*.html
+
+
diff --git a/debian/menu b/debian/menu
new file mode 100644
index 0000000000000000000000000000000000000000..ff443fd11c647b5cad5add3e41d5e279c0b68450
--- /dev/null
+++ b/debian/menu
@@ -0,0 +1,2 @@
+?package(fish):needs="text" section="Applications/Shells"\
+ title="fish" command="/usr/bin/fish"
diff --git a/debian/postinst b/debian/postinst
new file mode 100644
index 0000000000000000000000000000000000000000..e7e205bf1156137f1b9c1ed7639386be1ad1ea5d
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,47 @@
+#!/bin/sh
+# postinst script for fish
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+add_shell() {
+ if ! type add-shell > /dev/null 2>&1; then
+ return
+ fi
+
+ add-shell /usr/bin/fish
+}
+
+case "$1" in
+ configure)
+ add_shell
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/postrm b/debian/postrm
new file mode 100644
index 0000000000000000000000000000000000000000..b48530b7d94ba2670cb92543270a46d333ac1c21
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,37 @@
+#!/bin/sh
+# postrm script for fish
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postrm> `remove'
+# * <postrm> `purge'
+# * <old-postrm> `upgrade' <new-version>
+# * <new-postrm> `failed-upgrade' <old-version>
+# * <new-postrm> `abort-install'
+# * <new-postrm> `abort-install' <old-version>
+# * <new-postrm> `abort-upgrade' <old-version>
+# * <disappearer's-postrm> `disappear' <overwriter>
+# <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/prerm b/debian/prerm
new file mode 100644
index 0000000000000000000000000000000000000000..ac2029b57b531479fbb9cc2cf283e6fa82983689
--- /dev/null
+++ b/debian/prerm
@@ -0,0 +1,46 @@
+#!/bin/sh
+# prerm script for fish
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+remove_shell() {
+ if ! type remove-shell > /dev/null 2>&1; then
+ return
+ fi
+
+ remove-shell /usr/bin/fish
+}
+
+case "$1" in
+ remove|deconfigure)
+ remove_shell
+ ;;
+
+ upgrade|failed-upgrade)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000000000000000000000000000000000000..402bbd0f8a53e7b3a0350bd0fb5c23a94d942036
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,30 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+# dpkg-dev 1.16.1 doesn't export buildflags
+# can be removed once on dh compat level 9
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
+
+%:
+ dh $@ --with autotools-dev,autoreconf
+
+override_dh_auto_install:
+ dh_auto_install --destdir=debian/fish
+
+override_dh_install:
+ dh_install
+ # Debian policy: use system JQuery
+ ln -sf /usr/share/javascript/jquery/jquery.js $(CURDIR)/debian/fish/usr/share/fish/tools/web_config/jquery.js
+
+override_dh_installdocs:
+ dh_installdocs --link-doc=fish
+
+override_dh_strip:
+ dh_strip --dbg-package=fish-dbg
+
+# Don't run tests; they don't work until fish is installed
+override_dh_auto_test:
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000000000000000000000000000000000000..163aaf8d82b6c54f23c45f32895dbdfdcc27b047
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)