diff --git a/doc/UltiSnips.txt b/doc/UltiSnips.txt
index dcf80b1..2b67804 100644
--- a/doc/UltiSnips.txt
+++ b/doc/UltiSnips.txt
@@ -751,6 +751,7 @@ Contributers are listed in chronological order:
    peacech - Charles Gunawan
    guns - Sung Pae
    shlomif - Shlomi Fish
+   pberndt - Phillip Berndt
 
 7.2 Snippets                                       *UltiSnips-contrisnippets*
 ------------
diff --git a/plugin/snipMate_compatibility.vim b/plugin/snipMate_compatibility.vim
new file mode 100644
index 0000000..f88c25b
--- /dev/null
+++ b/plugin/snipMate_compatibility.vim
@@ -0,0 +1,28 @@
+" File: snipMate_compatibility.vim
+" Author: Phillip Berndt <phillip.berndt@gmail.com>
+" Description: Snipmate compatibility helper functions for UltiSnips
+"
+" Snipmate defines a function named Filename and a variable called
+" g:snips_author for use in snippet subtitutions. See
+"  https://github.com/msanders/snipmate.vim/blob/master/doc/snipMate.txt
+" for details.
+"
+
+if exists('did_UltiSnips_snipmate_compatibility')
+	finish
+endif
+let did_UltiSnips_snipmate_compatibility = 1
+
+" Define g:snips_author; some snipmate snippets use this
+if ! exists('g:snips_author')
+	let g:snips_author = "John Doe"
+endif
+
+" Filename function, taken from snipMate.vim {{{
+fun! Filename(...)
+    let filename = expand('%:t:r')
+    if filename == '' | return a:0 == 2 ? a:2 : '' | endif
+    return !a:0 || a:1 == '' ? filename : substitute(a:1, '$1', filename, 'g')
+endf
+" }}}
+
diff --git a/utils/convert_snipmate_snippets.py b/utils/convert_snipmate_snippets.py
new file mode 100755
index 0000000..2fdef8b
--- /dev/null
+++ b/utils/convert_snipmate_snippets.py
@@ -0,0 +1,88 @@
+#!/usr/bin/env python
+# encoding: utf-8
+"""
+Convert snipmate compatible snippets to UltiSnips compatible snippets
+by Phillip Berndt
+"""
+import sys
+import re
+import os
+import argparse
+
+def convert_snippet_contents(content):
+    " If the snippet contains snipmate style substitutions, convert them to ultisnips style "
+    content = re.sub("`([^`]+`)", "`!v \g<1>", content)
+    return content
+
+def convert_snippet_file(source):
+    " One file per filetype "
+    retval = ""
+    state = 0
+    for line in open(source).readlines():
+        # Ignore empty lines
+        if line.strip() == "":
+            continue
+        # The rest of the handlig is stateful
+        if state == 0:
+            # Find snippet start
+            if line[:8] == "snippet ":
+                snippet_info = re.match("(\S+)\s*(.*)", line[8:])
+                if not snippet_info:
+                    print >> sys.stderr, "Warning: Malformed snippet\n %s\n" % line
+                    continue
+                retval += 'snippet %s "%s"' % (snippet_info.group(1), snippet_info.group(2) if snippet_info.group(2) else snippet_info.group(1)) + "\n"
+                state = 1
+                snippet = ""
+        elif state == 1:
+            # First line of snippet: Get indentation
+            whitespace = re.search("^\s+", line)
+            if not whitespace:
+                print >> sys.stderr, "Warning: Malformed snippet, content not indented.\n"
+                retval += "endsnippet\n\n"
+                state = 0
+            else:
+                whitespace = whitespace.group(0)
+                snippet += line[len(whitespace):]
+                state = 2
+        elif state == 2:
+            # In snippet: Check if indentation level is the same. If not, snippet has ended
+            if line[:len(whitespace)] != whitespace:
+                retval += convert_snippet_contents(snippet) + "endsnippet\n\n"
+                state = 0
+            else:
+                snippet += line[len(whitespace):]
+    if state == 2:
+        retval += convert_snippet_contents(snippet) + "endsnippet\n\n"
+    return retval
+
+def convert_snippet(source):
+    " One file per snippet "
+    name = os.path.basename(source)[:-8]
+    return 'snippet %s "%s"' % (name, name) + "\n" + \
+        convert_snippet_contents(open(source).read()) + \
+        "\nendsnippet\n"
+
+def convert_snippets(source):
+    if os.path.isdir(source):
+        return "\n".join((convert_snippet(os.path.join(source, x)) for x in os.listdir(source) if x[-8:] == ".snippet"))
+    else:
+        return convert_snippet_file(source)
+
+if __name__ == '__main__':
+    # Parse command line
+    argsp = argparse.ArgumentParser(description="Convert snipmate compatible snippets to UltiSnips' file format",
+        epilog="example:\n  %s drupal/ drupal.snippets\n   will convert all drupal specific snippets from snipmate into one file drupal.snippets" % sys.argv[0],
+        formatter_class=argparse.RawDescriptionHelpFormatter)
+    argsp.add_argument("source", help="Source directory for one filetype or a snippets file")
+    argsp.add_argument("target", help="File to write the resulting snippets into. If omitted, the snippets will be written to stdout.", nargs="?", default="-")
+    args = argsp.parse_args()
+
+    source = args.source
+    try:
+        target = sys.stdout if args.target == "-" else open(args.target, "w")
+    except IOError:
+        print >> sys.stderr, "Error: Failed to open output file %s for writing" % args.target
+        sys.exit(1)
+
+    snippets = convert_snippets(source)
+    print >> target, snippets