diff --git a/PKGBUILD b/PKGBUILD
index f1ee9ff..1e53aef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,18 +21,17 @@ source=("$_pkgname.tar.gz"
         "$_pkgname.desktop")
 sha256sums=(SKIP
             SKIP)
+_sourcedir="$_pkgname"
 
 build() {
-    cd "$srcdir/$_pkgname"
-    make
+    make -C "$_sourcedir"
+    make -C "$_sourcedir" installinfo
 }
 
 package() {
-    cd "$srcdir/$_pkgname"
-    make PREFIX=/usr DESTDIR="$pkgdir" install
-    install -m755 -D st-pager "$pkgdir/usr/bin/st-pager"
-    install -m755 -D st-plumber "$pkgdir/usr/bin/st-plumber"
-    install -m644 -D LICENSE "$pkgdir/usr/share/doc/$_pkgname/LICENSE"
-    install -m644 -D README "$pkgdir/usr/share/doc/$_pkgname/README"
-    install -m644 -D "$srcdir/$_pkgname.desktop" "$pkgdir/usr/share/applications/$_pkgname.desktop"
+    make -C "$_sourcedir" PREFIX=/usr DESTDIR="$pkgdir" installwoinfo
+    install -m755 -D -t "$pkgdir/usr/bin" "$_sourcedir/st-pager" "$_sourcedir/st-plumber"
+    install -m644 -D -t "$pkgdir/usr/share/licenses/$_pkgname" "$_sourcedir/LICENSE"
+    install -m644 -D -t "$pkgdir/usr/share/doc/$_pkgname" "$_sourcedir/README"
+    install -m644 -D -t "$pkgdir/usr/share/applications" "$_pkgname.desktop"
 }
diff --git a/st/Makefile b/st/Makefile
index 470ac86..40db873 100644
--- a/st/Makefile
+++ b/st/Makefile
@@ -40,18 +40,22 @@ dist: clean
 	tar -cf - st-$(VERSION) | gzip > st-$(VERSION).tar.gz
 	rm -rf st-$(VERSION)
 
-install: st
+installwoinfo: st
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
 	cp -f st $(DESTDIR)$(PREFIX)/bin
 	chmod 755 $(DESTDIR)$(PREFIX)/bin/st
 	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
 	sed "s/VERSION/$(VERSION)/g" < st.1 > $(DESTDIR)$(MANPREFIX)/man1/st.1
 	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st.1
+
+installinfo:
 	tic -sx st.info
 	@echo Please see the README file regarding the terminfo entry of st.
 
+install: installwoinfo installinfo
+
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/st
 	rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1
 
-.PHONY: all options clean dist install uninstall
+.PHONY: all options clean dist installwoinfo installinfo install uninstall