diff --git devel/git/Makefile devel/git/Makefile
index 1bd2946..2c49914 100644
--- devel/git/Makefile
+++ devel/git/Makefile
@@ -132,13 +132,11 @@ RMMAN1+=	git-cvsimport.1 \
 RMMAN7+=	gitcvs-migration.7
 .endif
 
-post-extract:
-.if ${PORT_OPTIONS:MHTMLDOCS}
+post-extract-HTMLDOCS-on:
 	@${MKDIR} ${WRKDIR}/htmldocs
 	@cd ${WRKDIR}/htmldocs && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${DISTDIR}/${PORTNAME}-htmldocs-${DISTVERSION}${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS}
-.endif
 
 post-patch:
 .for FILE in ${RMMAN1}
@@ -148,29 +146,29 @@ post-patch:
 	@${RM} ${WRKDIR}/man7/${FILE}
 .endfor
 	@${REINPLACE_CMD} -e 's|share/man/man3|man/man3|' ${WRKSRC}/perl/Makefile.PL
-.if empty(PORT_OPTIONS:MCVS)
+
+post-patch-CVS-off:
 	@${REINPLACE_CMD} -e '/git-cvsexportcommit.perl/d; \
 		/git-cvsimport.perl/d; \
 		/git-cvsserver.perl/d; \
 		/documented,gitcvs-migration/d; \
 		s/git-cvsserver//' \
 		${WRKSRC}/Makefile
-.endif
-.if empty(PORT_OPTIONS:MSVN)
+
+post-patch-SVN-off:
 	@${REINPLACE_CMD} -e '/git-svn.perl/d' ${WRKSRC}/Makefile
-.endif
-.if empty(PORT_OPTIONS:MGITWEB)
+
+post-patch-GITHUB-off:
 	@${REINPLACE_CMD} -e '/$$(MAKE) -C gitweb install/d' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e "s,/usr/bin/perl,${PERL}," ${WRKSRC}/t/gitweb-lib.sh
-.endif
-.if empty(PORT_OPTIONS:MP4)
+
+post-patch-P4-off:
 	@${REINPLACE_CMD} -e '/^SCRIPT_PYTHON += git-p4.py$$/d' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \
 		${WRKSRC}/contrib/subtree/git-subtree.sh
-.endif
 
-post-build:
 .if ${PORT_OPTIONS:MP4} || ${PORT_OPTIONS:MCONTRIB}
+post-build:
 	@${FIND} ${WRKSRC} -name "*.bak" -delete
 .endif
 
@@ -178,16 +176,6 @@ post-install:
 	(cd ${WRKDIR}/man1/ && ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man1)
 	(cd ${WRKDIR}/man5/ && ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man5)
 	(cd ${WRKDIR}/man7/ && ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man7)
-.if ${PORT_OPTIONS:MHTMLDOCS}
-	# Manually remove the index.html symlink before installing, and then
-	# recreate it after. This is necessary because the distfile is
-	# extracted with --no-same-owner. If the distfile is extracted as a
-	# non-root user then the symlink will have the incorrect owner.
-	${RM} -f ${WRKDIR}/htmldocs/index.html
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKDIR}/htmldocs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-	${LN} -s git.html ${STAGEDIR}${DOCSDIR}/index.html
-.endif
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/git
 	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \
@@ -198,17 +186,42 @@ post-install:
 		${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/git/git.el
 	${LN} -sf ${PREFIX}/share/emacs/site-lisp/git/git-blame.el \
 		${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/git/git-blame.el
-.if ${PORT_OPTIONS:MCONTRIB}
+
+post-install-HTMLDOCS-on:
+	# Manually remove the index.html symlink before installing, and then
+	# recreate it after. This is necessary because the distfile is
+	# extracted with --no-same-owner. If the distfile is extracted as a
+	# non-root user then the symlink will have the incorrect owner.
+	${RM} -f ${WRKDIR}/htmldocs/index.html
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKDIR}/htmldocs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	${LN} -s git.html ${STAGEDIR}${DOCSDIR}/index.html
+
+post-install-CONTRIB-on:
 	@${ECHO_MSG} "===> Installing contributed scripts"
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/git-core/contrib
 	${CP} -R ${WRKSRC}/contrib/* ${STAGEDIR}${PREFIX}/share/git-core/contrib
 	cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} install install-doc
-.endif
-.if ${PORT_OPTIONS:MP4}
+	# Symlink the completions from the contrib directory to where they
+	# will be useful
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d \
+		${STAGEDIR}${PREFIX}/share/zsh/site-functions
+	@${LN} -s ../../share/git-core/contrib/completion/git-completion.bash \
+		${STAGEDIR}${PREFIX}/etc/bash_completion.d/git.sh
+	@${LN} -s ../../../share/git-core/contrib/completion/git-completion.zsh \
+		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_git
+
+post-install-CONTRIB-off:
+	# Install the contrib completions anyway
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d \
+		${STAGEDIR}${PREFIX}/share/zsh/site-functions
+	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/completion/git-completion.bash \
+		${STAGEDIR}${PREFIX}/etc/bash_completion.d/git.sh
+	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/completion/git-completion.zsh \
+		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_git
+
+post-install-P4-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py ${STAGEDIR}${PREFIX}/bin/
-.endif
-
-post-stage:
 
 .include <bsd.port.mk>
diff --git devel/git/pkg-plist devel/git/pkg-plist
index 482b7ff..95458c2 100644
--- devel/git/pkg-plist
+++ devel/git/pkg-plist
@@ -5,6 +5,7 @@ bin/git-receive-pack
 bin/git-upload-archive
 %%CVS%%bin/git-cvsserver
 bin/git-shell
+etc/bash_completion.d/git.sh
 man/man1/git.1.gz
 man/man1/git-add.1.gz
 man/man1/git-am.1.gz
@@ -1431,4 +1432,5 @@ share/git-core/templates/info/exclude
 %%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/README
 %%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/appp.sh
 %%CONTRIB%%share/git-core/contrib/workdir/git-new-workdir
+share/zsh/site-functions/_git
 @dir %%DATADIR%%-core/templates/branches