diff --git a/.gitignore b/.gitignore
index 1c8dfa3..61217a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *.zip
 *.gz
 vimball.txt
+*.orig
diff --git a/Makefile b/Makefile
index aae66c2..861df41 100644
--- a/Makefile
+++ b/Makefile
@@ -1,35 +1,68 @@
-PLUGIN=delimitMate
+PLUGIN=$(shell basename "$$PWD")
+SCRIPT=$(wildcard plugin/*.vim)
+#AUTOL=$(wildcard autoload/*.vim)
+AUTOL=autoload/$(PLUGIN).vim
+DOC=$(wildcard doc/*.txt)
+TESTS=$(wildcard autoload/*Tests.vim)
+VERSION=$(shell perl -ne 'if (/\*\sCurrent\srelease:/) {s/^\s+(\d+\.\d+).*$$/\1/;print}' $(DOC))
 VIMFOLDER=~/.vim
+DATE=`date '+%F'`
+VIM=/usr/bin/vim
 
-install:
-	install -m 755 -d ${VIMFOLDER}
-	install -m 755 -d ${VIMFOLDER}/plugin/
-	install -m 755 -d ${VIMFOLDER}/autoload/
-	install -m 755 -d ${VIMFOLDER}/doc/
-	cp -f doc/${PLUGIN}.txt      ${VIMFOLDER}/doc/${PLUGIN}.txt
-	cp -f plugin/${PLUGIN}.vim   ${VIMFOLDER}/plugin/${PLUGIN}.vim
-	cp -f autoload/${PLUGIN}.vim ${VIMFOLDER}/autoload/${PLUGIN}.vim
-	cp -f autoload/${PLUGIN}Tests.vim ${VIMFOLDER}/autoload/${PLUGIN}Tests.vim
+.PHONY: $(PLUGIN).vba README
 
-doc_update: install
-	/usr/bin/vim -u NONE -c ':helptags ${VIMFOLDER}/doc' -c ':q'
+all: uninstall vimball install README
 
-zip:
-	zip -r ${PLUGIN}.zip doc plugin autoload
-	zip ${PLUGIN}.zip -d \*.sw\?
-	zip ${PLUGIN}.zip -d autoload/${PLUGIN}Tests.vim
+vimball: $(PLUGIN).vba
 
-vimball: install
-	echo doc/${PLUGIN}.txt > vimball.txt
-	echo plugin/${PLUGIN}.vim >> vimball.txt
-	echo autoload/${PLUGIN}.vim >> vimball.txt
-	/usr/bin/vim  -c 'e vimball.txt' -c '%MkVimball! ${PLUGIN}' -c 'q'
+clean:
+	@echo clean
+	rm -f *.vba */*.orig *.~* .VimballRecord *.zip *.gz
 
-gzip: vimball
-	gzip -f ${PLUGIN}.vba
+dist-clean: clean
+
+install: vimball
+	@echo install
+	$(VIM) -N -c ':so %' -c':q!' $(PLUGIN)-$(VERSION).vba
+	cp -f autoload/$(PLUGIN)Tests.vim $(VIMFOLDER)/autoload/$(PLUGIN)Tests.vim
 
 uninstall:
-	rm -f ${VIMFOLDER}/plugin/${PLUGIN}.vim
-	rm -f ${VIMFOLDER}/autoload/${PLUGIN}.vim
-	rm -f ${VIMFOLDER}/doc/${PLUGIN}.txt
-	rm -f ${VIMFOLDER}/autoload/${PLUGIN}Tests.txt
+	@echo uninstall
+	$(VIM) -N -c':RmVimball' -c':q!' $(PLUGIN)-$(VERSION).vba
+	rm -f $(VIMFOLDER)/autoload/$(PLUGIN)Tests.txt
+
+undo:
+	for i in **/*.orig; do mv -f "$$i" "$${i%.*}"; done
+
+README:
+	@echo README
+	cp -f $(DOC) README
+
+$(PLUGIN).vba:
+	@echo $(PLUGIN).vba
+	rm -f $(PLUGIN)-$(VERSION).vba
+	$(VIM) -N -c 'ru! vimballPlugin.vim' -c ':call append("0", [ "$(SCRIPT)", "$(AUTOL)", "$(DOC)"])' -c '$$d' -c ":%MkVimball $(PLUGIN)-$(VERSION)  ." -c':q!'
+	ln -f $(PLUGIN)-$(VERSION).vba $(PLUGIN).vba
+
+zip:
+	@echo zip
+	zip -r $(PLUGIN).zip doc plugin autoload
+	zip $(PLUGIN).zip -d \*.sw\?
+	zip $(PLUGIN).zip -d autoload/$(PLUGIN)Tests.vim
+
+gzip: vimball
+	@echo vimball
+	gzip -f $(PLUGIN).vba
+
+release: version all
+
+version:
+	@echo version: $(VERSION)
+	perl -i.orig -pne 'if (/^"\sVersion:/) {s/(\d+\.\d+)/$(VERSION)/e}' $(SCRIPT) $(AUTOL)
+	perl -i.orig -pne 'if (/let\sdelimitMate_version/) {s/(\d+\.\d+)/$(VERSION)/e}' $(SCRIPT)
+	perl -i.orig -pne 'if (/beasts/) {s/(v\d+\.\d+)/v.$(VERSION)/e}' $(DOC)
+	perl -i.orig -pne 'if (/^"\sModified:/) {s/(\d+-\d+-\d+)/sprintf("%s", `date "+%F"`)/e}' $(SCRIPT) $(AUTOL)
+	perl -i.orig -pne 'if (/^\s+$(VERSION)\s+\d+-\d+-\d+\s+\*/) {s/(\d+-\d+-\d+)/$(DATE)/e}' $(DOC)
+	@echo Version: $(VERSION)
+
+echo:
diff --git a/README b/README
index 9e32c23..76f53ca 100644
--- a/README
+++ b/README
@@ -451,7 +451,7 @@ e.g.: This mapping could be used to select an item on a pop-up menu or expand
 <CR> inside an empty pair: >
 
         inoremap <expr> <CR> pumvisible() ? "\<c-y>" :
-                 \ delimitMate#WithinEmptyPair ?
+                 \ delimitMate#WithinEmptyPair() ?
                  \ delimitMate#ExpandReturn() : "\<CR>"
 <
 ------------------------------------------------------------------------------
diff --git a/autoload/delimitMate.vim b/autoload/delimitMate.vim
index 5728772..8e2927b 100644
--- a/autoload/delimitMate.vim
+++ b/autoload/delimitMate.vim
@@ -1,7 +1,8 @@
 " ============================================================================
 " File:        autoload/delimitMate.vim
 " Version:     2.2
-" Modified:    2010-01-01
+" Modified:    2010-05-16
+
 " Description: This plugin provides auto-completion for quotes, parens, etc.
 " Maintainer:  Israel Chauca F. <israelchauca@gmail.com>
 " Manual:      Read ":help delimitMate".
diff --git a/plugin/delimitMate.vim b/plugin/delimitMate.vim
index 8f80d2c..d955b43 100644
--- a/plugin/delimitMate.vim
+++ b/plugin/delimitMate.vim
@@ -1,7 +1,8 @@
 " ============================================================================
 " File:        plugin/delimitMate.vim
 " Version:     2.2
-" Modified:    2010-01-01
+" Modified:    2010-05-16
+
 " Description: This plugin provides auto-completion for quotes, parens, etc.
 " Maintainer:  Israel Chauca F. <israelchauca@gmail.com>
 " Manual:      Read ":help delimitMate".