diff --git a/.hgignore b/.hgignore
index 67e439f1..083293e7 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,42 +1,47 @@
-\.(deps|libs|svn)/
-\.(l?[oa]|rej|orig|pyc|out|exe|bak)$
-(\~|\.DS_Store)$
-^(\..*\.session|.*\.kdevelop\.pcs|.*\.kdevses)$
-Makefile(\.in)?$
-^m4/(libtool|lt.*)\.m4$
-^(autom4te\.cache|build)/
-^(compile|mkinstalldirs|config\..*|configargs\.h|configure|depcomp|install-sh|intltool-(extract|merge|update)|libtool|ltmain\.sh|missing|stamp-h1|aclocal\.m4)$
-^intltool-(extract|merge|update)\.in$
-^medit/medit(\.(desktop|iss))?$
-^po(-gsv)?/(\.intltool-merge-cache|POTFILES|stamp-it|missing|moo\.pot|notexist|Makefile\.in\.in)
-^tests/pyapp\.py$
-^moo/moo(-config\.h|\.pc)$
-^moo/mooedit/gtksourceview/.*-mangled\.[ch]$
-^moo/mooedit/(language-specs/moo\.xml|stamp-mooedit-enums\.[ch])$
-^moo/mooedit/language-specs/testdir
-^moo/moofileview/(symlink\.h)$
-^moo/moopython/plugins/(pyproject/project-plugin|python|terminal)\.ini$
-^moo/moopython/pygtk/(moo(app|edit|term|utils)?-mod\.h|moo(app|edit|term|utils)-pygtk\.c)$
-^moo/mooterm/termhelper_res\.rc$
-^moo/mooutils/(moomarshals\.[ch]|stock-(moo|medit)\.h)$
-^moo/mooapp/smclient/(README|egg-session-end\.c|eggdesktopfile\.[ch]|eggsmclient-libgnomeui\.[ch]|eggsmclient-osx\.c|gedit\.diff|smclient\.patch)$
-mooapp-old/
-^moo/mooutils/xdgmime/.cvsignore$
-^moo/mooutils/xdgmime/CVS
-^moo/mooapp/smclient/ChangeLog$
-^moo/mooapp/smclient/NEWS$
-^moo/mooapp/smclient/egg-launch.c$
-^moo/mooapp/smclient/logout-test.c$
-^moo/moopython/pygtk/goocanvas/CVS
-^moo/moopython/pygtk/goocanvas/.cvsignore
-^patches/
-^po(-gsv)?/(dist|pot)$
-^po-gsv/po-(stripped|orig)
-^ppc-configure
-/CVS/
-^winbuild/.*\.(aps|ncb|suo)$
-^winbuild/mingwds$
-^winbuild/devcpp$
-^xcode/build$
-^xcode/medit.xcodeproj/.*\.mode1$
-^xcode/medit.xcodeproj/.*\.pbxuser$
+syntax: glob
+
+build/
+autom4te.cache/
+
+*.orig
+*.rej
+*.bak
+*.pyc
+*~
+Makefile.in
+
+.moo.mprj.session
+a.out
+aclocal.m4
+config.guess
+config.h.in
+config.sub
+configure
+depcomp
+install-sh
+intltool-extract.in
+intltool-merge.in
+intltool-update.in
+ltmain.sh
+missing
+mkinstalldirs
+po-gsv/Makefile.in.in
+po-gsv/dist
+po-gsv/missing
+po-gsv/pot
+po/Makefile.in.in
+po/dist
+po/missing
+po/pot
+
+syntax: regexp
+
+^Makefile\.am
+^medit/Makefile\.am
+^moo/Makefile\.am
+^moo/mooedit/Makefile\.am
+^moo/mooedit/plugins/Makefile\.am
+^moo/moofileview/Makefile\.am
+^moo/mooterm/Makefile\.am
+^moo/mooui/Makefile\.am
+^moo/mooutils/Makefile\.am