diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index 1b4e95057d..0000000000
--- a/.bzrignore
+++ /dev/null
@@ -1,135 +0,0 @@
-# Compiled or generated source #
-################################
-*.dll
-*.exe
-*.la
-*.lo
-*.obj
-*.pyc
-*.so
-*.[oa]
-*grammar.out
-*grammar.[ch]
-*scanner.c
-*_dict.c
-*_lex.h
-epan/declare_wslua.h
-epan/dissectors/dcerpc/idl2wrs
-epan/dissectors/packet-ncp2222.c
-epan/dissectors/register-cache.pkl
-epan/dissectors/register.c
-epan/dtd_parse.c
-epan/dtd_preparse.c
-epan/init.lua
-epan/packet-ncp2222.c
-epan/register-cache.pkl
-epan/register.c
-epan/register_wslua.c
-epan/sminmpec.c
-epan/taps.txt
-epan/taps_wslua.c
-epan/uat_load.c
-epan/wslua/declare_wslua.h
-epan/wslua/init.lua
-epan/wslua/register_wslua.c
-epan/wslua/taps.txt
-epan/wslua/taps_wslua.c
-ui/gtk/wireshark-tap-register.c
-plugin.c
-plugins/mate/mate_parser.c
-ps.c
-svnversion.h
-tools/lemon/lemon
-tools/lemon/lemon
-tools/setuid-root.pl
-tshark-tap-register.c
-wiretap/ascend.c
-wiretap/ascend.h
-wiretap/k12text.c
-
-
-# Generated makefile system #
-#############################
-*.sym
-aclocal.m4
-autom4te.cache
-capinfos
-compile
-config.h
-config.h.in
-config.log
-config.status
-configure
-depcomp
-dftest
-dumpcap
-editcap
-install-sh
-libtool
-ltmain.sh
-Makefile
-Makefile.in
-mergecap
-missing
-randpkt
-rawshark
-reordercap
-stamp-h1
-text2pcap
-tshark
-wireshark
-ylwrap
-
-
-# CMake #
-##################
-CMakeCache.txt
-CMakeFiles
-cmake_install.cmake
-CPackConfig.cmake
-CPackSourceConfig.cmake
-lib/
-
-
-# Generated dir #
-##################
-.deps
-.libs
-
-
-# Doc #
-########
-*.html
-*.[14]
-AUTHORS-SHORT
-AUTHORS-SHORT-FORMAT
-doxygen.cfg
-help/faq.txt
-pod2htm[di].tmp
-wireshark.pod
-
-# Qt #
-######
-qtshark
-/ui/qt/__/
-/ui/qt/*.qrc.depends
-/ui/qt/*.pro.user
-/ui/qt/*.qm
-/ui/qt/moc_*.cpp
-/ui/qt/moc_*.cxx
-/ui/qt/qrc_*.cpp
-/ui/qt/qrc_*.cxx
-/ui/qt/ui_*.h
-/ui/qt/console.lua
-
-# Misc #
-########
-*.swp
-*~
-.DS_Store
-cscope.*
-packaging/macosx/COPYING.txt
-packaging/macosx/Info.plist
-packaging/rpm/SPECS/wireshark.spec
-packaging/svr4/checkinstall
-packaging/svr4/pkginfo
diff --git a/.bzrignore b/.bzrignore
new file mode 120000
index 0000000000..3e4e48b0b5
--- /dev/null
+++ b/.bzrignore
@@ -0,0 +1 @@
+.gitignore
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 4ec766a6e3..1b4e95057d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,6 +111,7 @@ wireshark.pod
 # Qt #
 ######
 qtshark
+/ui/qt/__/
 /ui/qt/*.qrc.depends
 /ui/qt/*.pro.user
 /ui/qt/*.qm
@@ -126,6 +127,7 @@ qtshark
 *.swp
 *~
 .DS_Store
+cscope.*
 packaging/macosx/COPYING.txt
 packaging/macosx/Info.plist
 packaging/rpm/SPECS/wireshark.spec