diff --git a/x11/autorandr/Makefile b/x11/autorandr/Makefile
index 7ef114e4f11..81ca3bd6485 100644
--- a/x11/autorandr/Makefile
+++ b/x11/autorandr/Makefile
@@ -1,4 +1,4 @@
-COMMENT=	automates xrandr calls based on connect devices
+COMMENT=	automates xrandr calls based on connected devices
 
 CATEGORIES=	x11 sysutils
 
@@ -6,13 +6,11 @@ GH_ACCOUNT=	phillipberndt
 GH_PROJECT=	autorandr
 GH_TAGNAME=	1.15
 MODPY_EGG_VERSION=	${GH_TAGNAME}.post1
-REVISION=		0
+REVISION=		1
 
 # GPLv3+
 PERMIT_PACKAGE=	Yes
 
-MAINTAINER=	Ashton Fagg <ashton@fagg.id.au>
-
 MODULES=	lang/python
 MODPY_PYBUILD =	setuptools
 
@@ -21,5 +19,8 @@ NO_TEST=	Yes
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/autorandr.1 ${PREFIX}/man/man1/autorandr.1
+	${INSTALL_DATA} -D {${WRKSRC}/contrib/bash_completion/,${PREFIX}/share/bash_completion/completions}/autorandr
+	${INSTALL_DATA} -D {${WRKSRC}/contrib/fish_completion/,${PREFIX}/share/fish/vendor_completions.d}/autorandr.fish
+	${INSTALL_DATA} -D {${WRKSRC}/contrib/zsh_completion/,${PREFIX}/share/zsh/site-functions}/_autorandr
 
 .include <bsd.port.mk>
diff --git a/x11/autorandr/pkg/PLIST b/x11/autorandr/pkg/PLIST
index e52d777be06..cf9aae7208f 100644
--- a/x11/autorandr/pkg/PLIST
+++ b/x11/autorandr/pkg/PLIST
@@ -10,3 +10,12 @@ lib/python${MODPY_VERSION}/site-packages/autorandr-${MODPY_EGG_VERSION}.dist-inf
 lib/python${MODPY_VERSION}/site-packages/autorandr-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/autorandr.py
 @man man/man1/autorandr.1
+share/bash_completion/
+share/bash_completion/completions/
+share/bash_completion/completions/autorandr
+share/fish/
+share/fish/vendor_completions.d/
+share/fish/vendor_completions.d/autorandr.fish
+share/zsh/
+share/zsh/site-functions/
+share/zsh/site-functions/_autorandr