diff --git a/Makefile.in b/Makefile.in
index 16867e5acb..6aefa7f685 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -550,9 +550,9 @@ uninstall.vpi:
 	$(RM) -f $(DESTDIR)$(incdir)/vhpi_user.h
 
 install.vpi.local: all.vpi
-	$(MKDIR) -p include lib
-	$(INSTALL_DATA) -p $(GRTSRCDIR)/vpi_user.h include/
-	$(INSTALL_DATA) -p $(GRTSRCDIR)/vhpi_user.h include/
+	$(MKDIR) -p include/ghdl lib
+	$(INSTALL_DATA) -p $(GRTSRCDIR)/vpi_user.h include/ghdl/
+	$(INSTALL_DATA) -p $(GRTSRCDIR)/vhpi_user.h include/ghdl/
 
 ################ Libraries ###############################################