diff --git a/Makefile.in b/Makefile.in
index e199b417b..ba515a38b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,6 +63,7 @@ libdir = @libdir@
 # It is a little different from the generic includedir.
 includedir = @includedir@/iverilog$(suffix)
 mandir = @mandir@
+pdfdir = @docdir@
 
 dllib=@DLLIB@
 
@@ -308,11 +309,14 @@ version_tag.h version:
 ifeq (@MINGW32@,yes)
 ifeq ($(MAN),none)
 INSTALL_DOC = installman
+INSTALL_PDFDIR = $(prefix)
 else
 ifeq ($(PS2PDF),none)
 INSTALL_DOC = installman
+INSTALL_PDFDIR = $(prefix)
 else
 INSTALL_DOC = installpdf installman
+INSTALL_PDFDIR = $(pdfdir)
 all: dep iverilog-vpi.pdf
 endif
 endif
@@ -320,6 +324,7 @@ INSTALL_DOCDIR = $(mandir)/man1
 else
 INSTALL_DOC = installman
 INSTALL_DOCDIR = $(mandir)/man1
+INSTALL_PDFDIR = $(prefix)
 endif
 
 ifeq (@MINGW32@,yes)
@@ -350,7 +355,7 @@ installman: iverilog-vpi.man installdirs
 	$(INSTALL_DATA) iverilog-vpi.man "$(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1"
 
 installpdf: iverilog-vpi.pdf installdirs
-	$(INSTALL_DATA) iverilog-vpi.pdf "$(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf"
+	$(INSTALL_DATA) iverilog-vpi.pdf "$(DESTDIR)$(pdfdir)/iverilog-vpi$(suffix).pdf"
 
 installfiles: $(F) | installdirs
 	$(INSTALL_PROGRAM) ./ivl@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@"
@@ -368,8 +373,8 @@ installdirs: $(srcdir)/mkinstalldirs
 	    "$(DESTDIR)$(includedir)" \
 	    "$(DESTDIR)$(libdir)/ivl$(suffix)" \
 	    "$(DESTDIR)$(libdir)/ivl$(suffix)/include" \
-	    "$(DESTDIR)$(mandir)" \
-	    "$(DESTDIR)$(mandir)/man1"
+	    "$(DESTDIR)$(INSTALL_DOCDIR)" \
+	    "$(DESTDIR)$(INSTALL_PDFDIR)"
 
 uninstall:
 	$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true
@@ -382,7 +387,8 @@ uninstall:
 	for f in ivl_target.h vpi_user.h _pli_types.h sv_vpi_user.h acc_user.h veriuser.h; \
 	    do rm -f "$(DESTDIR)$(includedir)/$$f"; done
 	-test X$(suffix) = X || rmdir "$(DESTDIR)$(includedir)"
-	rm -f "$(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1" "$(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf"
+	rm -f "$(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1" \
+	      "$(DESTDIR)$(pdfdir)/iverilog-vpi$(suffix).pdf"
 
 
 -include $(patsubst %.o, dep/%.d, $O)
diff --git a/driver/Makefile.in b/driver/Makefile.in
index a41868cf8..25beaf209 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -30,6 +30,7 @@ bindir = $(exec_prefix)/bin
 libdir = $(exec_prefix)/lib
 includedir = $(prefix)/include
 mandir = @mandir@
+pdfdir = @docdir@
 
 dllib=@DLLIB@
 
@@ -113,11 +114,14 @@ iverilog.pdf: iverilog.ps
 ifeq (@MINGW32@,yes)
 ifeq ($(MAN),none)
 INSTALL_DOC = installman
+INSTALL_PDFDIR = $(prefix)
 else
 ifeq ($(PS2PDF),none)
 INSTALL_DOC = installman
+INSTALL_PDFDIR = $(prefix)
 else
 INSTALL_DOC = installpdf installman
+INSTALL_PDFDIR = $(pdfdir)
 all: iverilog.pdf
 endif
 endif
@@ -125,6 +129,7 @@ INSTALL_DOCDIR = $(mandir)/man1
 else
 INSTALL_DOC = installman
 INSTALL_DOCDIR = $(mandir)/man1
+INSTALL_PDFDIR = $(prefix)
 endif
 
 install: all installdirs installfiles
@@ -136,16 +141,18 @@ installman: iverilog.man installdirs
 	$(INSTALL_DATA) iverilog.man "$(DESTDIR)$(mandir)/man1/iverilog$(suffix).1"
 
 installpdf: iverilog.pdf installdirs
-	$(INSTALL_DATA) iverilog.pdf "$(DESTDIR)$(prefix)/iverilog$(suffix).pdf"
+	$(INSTALL_DATA) iverilog.pdf "$(DESTDIR)$(pdfdir)/iverilog$(suffix).pdf"
 
 installfiles: $(F) | installdirs
 	$(INSTALL_PROGRAM) ./iverilog@EXEEXT@ "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@"
 
 installdirs: $(srcdir)/../mkinstalldirs
-	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(INSTALL_DOCDIR)"
+	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" \
+		"$(DESTDIR)$(INSTALL_DOCDIR)" \
+		"$(DESTDIR)$(INSTALL_PDFDIR)"
 
 uninstall:
 	rm -f "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@"
-	rm -f "$(DESTDIR)$(mandir)/man1/iverilog$(suffix).1" "$(DESTDIR)$(prefix)/iverilog$(suffix).pdf"
+	rm -f "$(DESTDIR)$(mandir)/man1/iverilog$(suffix).1" "$(DESTDIR)$(pdfdir)/iverilog$(suffix).pdf"
 
 -include $(patsubst %.o, dep/%.d, $O)
diff --git a/msys2/PKGBUILD b/msys2/PKGBUILD
index e44f7493a..6ad4bab42 100644
--- a/msys2/PKGBUILD
+++ b/msys2/PKGBUILD
@@ -33,7 +33,5 @@ check() {
 
 package() {
   cd "${srcdir}"/../..
-  mingw32-make DESTDIR="${pkgdir}" install
-  mkdir -p "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}"
-  mv "${pkgdir}${MINGW_PREFIX}"/*.pdf "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}"
+  mingw32-make DESTDIR="${pkgdir}" PACKAGE="${_realname}" install
 }
diff --git a/vvp/Makefile.in b/vvp/Makefile.in
index 7be416261..86a9a998c 100644
--- a/vvp/Makefile.in
+++ b/vvp/Makefile.in
@@ -32,6 +32,7 @@ mandir = @mandir@
 # This is actually the directory where we install our own header files.
 # It is a little different from the generic includedir.
 includedir = @includedir@/iverilog$(suffix)
+pdfdir = @docdir@
 
 # For a cross compile these defines will need to be set accordingly.
 HOSTCC = @CC@
@@ -203,11 +204,14 @@ vvp.pdf: vvp.ps
 ifeq (@MINGW32@,yes)
 ifeq ($(MAN),none)
 INSTALL_DOC = installman
+INSTALL_PDFDIR = $(prefix)
 else
 ifeq ($(PS2PDF),none)
 INSTALL_DOC = installman
+INSTALL_PDFDIR = $(prefix)
 else
 INSTALL_DOC = installpdf installman
+INSTALL_PDFDIR = $(pdfdir)
 all: vvp.pdf
 endif
 endif
@@ -215,6 +219,7 @@ INSTALL_DOCDIR = $(mandir)/man1
 else
 INSTALL_DOC = installman
 INSTALL_DOCDIR = $(mandir)/man1
+INSTALL_PDFDIR = $(prefix)
 endif
 
 stamp-config-h: $(srcdir)/config.h.in ../config.status
@@ -230,7 +235,7 @@ installman: vvp.man installdirs
 	$(INSTALL_DATA) vvp.man "$(DESTDIR)$(mandir)/man1/vvp$(suffix).1"
 
 installpdf: vvp.pdf installdirs
-	$(INSTALL_DATA) vvp.pdf "$(DESTDIR)$(prefix)/vvp$(suffix).pdf"
+	$(INSTALL_DATA) vvp.pdf "$(DESTDIR)$(pdfdir)/vvp$(suffix).pdf"
 
 installfiles: $(F) | installdirs
 	$(INSTALL_PROGRAM) ./vvp@EXEEXT@ "$(DESTDIR)$(bindir)/vvp$(suffix)@EXEEXT@"
@@ -240,12 +245,15 @@ ifeq (@LIBVVP@,yes)
 endif
 
 installdirs: $(srcdir)/../mkinstalldirs
-	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(INSTALL_DOCDIR)"
+	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" \
+		"$(DESTDIR)$(libdir)" \
+		"$(DESTDIR)$(INSTALL_DOCDIR)" \
+		"$(DESTDIR)$(INSTALL_PDFDIR)"
 
 
 uninstall: $(UNINSTALL32)
 	rm -f "$(DESTDIR)$(bindir)/vvp$(suffix)@EXEEXT@"
-	rm -f "$(DESTDIR)$(mandir)/man1/vvp$(suffix).1" "$(DESTDIR)$(prefix)/vvp$(suffix).pdf"
+	rm -f "$(DESTDIR)$(mandir)/man1/vvp$(suffix).1" "$(DESTDIR)$(pdfdir)/vvp$(suffix).pdf"
 ifeq (@LIBVVP@,yes)
 	rm -f "$(DESTDIR)$(libdir)/libvvp$(suffix).$(SLEXT)"
 	rm -f "$(DESTDIR)$(includedir)/libvvp.h"