diff --git a/Makefile.in b/Makefile.in
index a45841892..3b16d2dd9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -244,10 +244,10 @@ $(libdir)/ivl/ivl@EXEEXT@: ./ivl@EXEEXT@
 	$(INSTALL_PROGRAM) ./ivl@EXEEXT@ $(DESTDIR)$(libdir)/ivl/ivl@EXEEXT@
 
 $(libdir)/ivl/include/constants.vams: $(srcdir)/constants.vams
-	$(INSTALL_DATA) $(srcdir)/constants.vams $@
+	$(INSTALL_DATA) $(srcdir)/constants.vams $(DESTDIR)$(libdir)/ivl/include/constants.vams
 
 $(libdir)/ivl/include/disciplines.vams: $(srcdir)/disciplines.vams
-	$(INSTALL_DATA) $(srcdir)/disciplines.vams $@
+	$(INSTALL_DATA) $(srcdir)/disciplines.vams $(DESTDIR)$(libdir)/ivl/include/disciplines.vams
 
 $(libdir)/ivl/xnf-s.conf: $(srcdir)/xnf-s.conf
 	$(INSTALL_DATA) $(srcdir)/xnf-s.conf $(DESTDIR)$(libdir)/ivl/xnf-s.conf
diff --git a/cadpli/Makefile.in b/cadpli/Makefile.in
index 9d8885847..2d4f81c0f 100644
--- a/cadpli/Makefile.in
+++ b/cadpli/Makefile.in
@@ -76,13 +76,13 @@ distclean: clean
 install: all installdirs $(vpidir)/cadpli.vpl $(INSTALL32)
 
 $(vpidir)/cadpli.vpl: ./cadpli.vpl
-	$(INSTALL_PROGRAM) ./cadpli.vpl $(vpidir)/cadpli.vpl
+	$(INSTALL_PROGRAM) ./cadpli.vpl $(DESTDIR)$(vpidir)/cadpli.vpl
 
 installdirs: ../mkinstalldirs
-	$(srcdir)/../mkinstalldirs $(vpidir)
+	$(srcdir)/../mkinstalldirs $(DESTDIR)$(vpidir)
 
 uninstall: $(UNINSTALL32)
-	rm -f $(vpidir)/cadpli.vpl
+	rm -f $(DESTDIR)$(vpidir)/cadpli.vpl
 
 uninstall32:
 
diff --git a/driver/Makefile.in b/driver/Makefile.in
index 254b65dfd..e3b91d3e4 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -100,17 +100,17 @@ endif
 install: all installdirs $(bindir)/iverilog@EXEEXT@ $(INSTALL_DOC)
 
 $(bindir)/iverilog@EXEEXT@: ./iverilog@EXEEXT@
-	$(INSTALL_PROGRAM) ./iverilog@EXEEXT@ $(bindir)/iverilog@EXEEXT@
+	$(INSTALL_PROGRAM) ./iverilog@EXEEXT@ $(DESTDIR)$(bindir)/iverilog@EXEEXT@
 
 $(mandir)/man1/iverilog.1: $(srcdir)/iverilog.man
-	$(INSTALL_DATA) $(srcdir)/iverilog.man $(mandir)/man1/iverilog.1
+	$(INSTALL_DATA) $(srcdir)/iverilog.man $(DESTDIR)$(mandir)/man1/iverilog.1
 
 $(prefix)/iverilog.pdf: iverilog.pdf
 	$(INSTALL_DATA) iverilog.pdf $(prefix)/iverilog.pdf
 
 installdirs: ../mkinstalldirs
-	$(srcdir)/../mkinstalldirs $(bindir) $(INSTALL_DOCDIR)
+	$(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(INSTALL_DOCDIR)
 
 uninstall:
-	rm -f $(bindir)/iverilog@EXEEXT@
-	rm -f $(mandir)/man1/iverilog.1 $(prefix)/iverilog.pdf
+	rm -f $(DESTDIR)$(bindir)/iverilog@EXEEXT@
+	rm -f $(DESTDIR)$(mandir)/man1/iverilog.1 $(DESTDIR)$(prefix)/iverilog.pdf
diff --git a/ivlpp/Makefile.in b/ivlpp/Makefile.in
index b55b5c7ac..b66ed207a 100644
--- a/ivlpp/Makefile.in
+++ b/ivlpp/Makefile.in
@@ -63,13 +63,13 @@ lexor.c: lexor.lex
 install: all installdirs $(libdir)/ivl/ivlpp@EXEEXT@
 
 $(libdir)/ivl/ivlpp@EXEEXT@: ivlpp@EXEEXT@
-	$(INSTALL_PROGRAM) ./ivlpp@EXEEXT@ $(libdir)/ivl/ivlpp@EXEEXT@
+	$(INSTALL_PROGRAM) ./ivlpp@EXEEXT@ $(DESTDIR)$(libdir)/ivl/ivlpp@EXEEXT@
 
 installdirs: ../mkinstalldirs
-	$(srcdir)/../mkinstalldirs $(libdir)/ivl
+	$(srcdir)/../mkinstalldirs $(DESTDIR)$(libdir)/ivl
 
 uninstall:
-	rm -f $(libdir)/ivl/ivlpp@EXEEXT@
+	rm -f $(DESTDIR)$(libdir)/ivl/ivlpp@EXEEXT@
 
 lexor.o: lexor.c globals.h
 main.o: main.c globals.h
diff --git a/libveriuser/Makefile.in b/libveriuser/Makefile.in
index c8a56679c..7fc807e84 100644
--- a/libveriuser/Makefile.in
+++ b/libveriuser/Makefile.in
@@ -89,12 +89,12 @@ distclean: clean
 install:: all installdirs $(libdir)/libveriuser.a $(INSTALL32)
 
 $(libdir)/libveriuser.a: ./libveriuser.a
-	$(INSTALL_DATA) ./libveriuser.a $(libdir)/libveriuser.a
+	$(INSTALL_DATA) ./libveriuser.a $(DESTDIR)$(libdir)/libveriuser.a
 
 installdirs: mkinstalldirs
-	$(srcdir)/mkinstalldirs $(includedir) $(libdir)
+	$(srcdir)/mkinstalldirs $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)
 
 uninstall::
-	rm -f $(libdir)/libveriuser.a
+	rm -f $(DESTDIR)$(libdir)/libveriuser.a
 
 -include $(patsubst %.o, dep/%.d, $O)
diff --git a/tgt-null/Makefile.in b/tgt-null/Makefile.in
index 204e6a00c..426d35230 100644
--- a/tgt-null/Makefile.in
+++ b/tgt-null/Makefile.in
@@ -75,22 +75,22 @@ check: all
 install: all installdirs $(libdir)/ivl/null.tgt $(INSTALL_DOC) $(libdir)/ivl/null.conf $(libdir)/ivl/null-s.conf
 
 $(libdir)/ivl/null.tgt: ./null.tgt
-	$(INSTALL_PROGRAM) ./null.tgt $(libdir)/ivl/null.tgt
+	$(INSTALL_PROGRAM) ./null.tgt $(DESTDIR)$(libdir)/ivl/null.tgt
 
 $(libdir)/ivl/null.conf: $(srcdir)/null.conf
-	$(INSTALL_DATA) $(srcdir)/null.conf $(libdir)/ivl/null.conf
+	$(INSTALL_DATA) $(srcdir)/null.conf $(DESTDIR)$(libdir)/ivl/null.conf
 
 $(libdir)/ivl/null-s.conf: $(srcdir)/null-s.conf
-	$(INSTALL_DATA) $(srcdir)/null-s.conf $(libdir)/ivl/null-s.conf
+	$(INSTALL_DATA) $(srcdir)/null-s.conf $(DESTDIR)$(libdir)/ivl/null-s.conf
 
 
 installdirs: ../mkinstalldirs
-	$(srcdir)/../mkinstalldirs $(includedir) $(bindir) $(libdir)/ivl
+	$(srcdir)/../mkinstalldirs $(DESTDIR)$(includedir) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/ivl
 
 uninstall:
-	rm -f $(libdir)/ivl/null.tgt
-	rm -f $(libdir)/ivl/null.conf
-	rm -f $(libdir)/ivl/null-s.conf
+	rm -f $(DESTDIR)$(libdir)/ivl/null.tgt
+	rm -f $(DESTDIR)$(libdir)/ivl/null.conf
+	rm -f $(DESTDIR)$(libdir)/ivl/null-s.conf
 
 
 -include $(patsubst %.o, dep/%.d, $O)
diff --git a/tgt-stub/Makefile.in b/tgt-stub/Makefile.in
index 679226758..20d0136f9 100644
--- a/tgt-stub/Makefile.in
+++ b/tgt-stub/Makefile.in
@@ -76,21 +76,21 @@ install: all installdirs $(libdir)/ivl/stub.tgt \
 	$(libdir)/ivl/stub.conf $(libdir)/ivl/stub-s.conf
 
 $(libdir)/ivl/stub.tgt: ./stub.tgt
-	$(INSTALL_PROGRAM) ./stub.tgt $(libdir)/ivl/stub.tgt
+	$(INSTALL_PROGRAM) ./stub.tgt $(DESTDIR)$(libdir)/ivl/stub.tgt
 
 $(libdir)/ivl/stub.conf: stub.conf
-	$(INSTALL_DATA) $< $(libdir)/ivl/stub.conf
+	$(INSTALL_DATA) $< $(DESTDIR)$(libdir)/ivl/stub.conf
 
 $(libdir)/ivl/stub-s.conf: stub-s.conf
-	$(INSTALL_DATA) $< $(libdir)/ivl/stub-s.conf
+	$(INSTALL_DATA) $< $(DESTDIR)$(libdir)/ivl/stub-s.conf
 
 installdirs: ../mkinstalldirs
-	$(srcdir)/../mkinstalldirs $(includedir) $(bindir) $(libdir)/ivl
+	$(srcdir)/../mkinstalldirs $(DESTDIR)$(includedir) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/ivl
 
 uninstall:
-	rm -f $(libdir)/ivl/stub.tgt
-	rm -f $(libdir)/ivl/stub.conf
-	rm -f $(libdir)/ivl/stub-s.conf
+	rm -f $(DESTDIR)$(libdir)/ivl/stub.tgt
+	rm -f $(DESTDIR)$(libdir)/ivl/stub.conf
+	rm -f $(DESTDIR)$(libdir)/ivl/stub-s.conf
 
 
 -include $(patsubst %.o, dep/%.d, $O)
diff --git a/tgt-vhdl/Makefile.in b/tgt-vhdl/Makefile.in
index bbd0cfeaf..7b76b1936 100644
--- a/tgt-vhdl/Makefile.in
+++ b/tgt-vhdl/Makefile.in
@@ -77,16 +77,16 @@ check: all
 install: all installdirs $(libdir)/ivl/vhdl.tgt $(libdir)/ivl/vhdl.conf
 
 $(libdir)/ivl/vhdl.tgt: ./vhdl.tgt
-	$(INSTALL_PROGRAM) ./vhdl.tgt $(libdir)/ivl/vhdl.tgt
+	$(INSTALL_PROGRAM) ./vhdl.tgt $(DESTDIR)$(libdir)/ivl/vhdl.tgt
 
 $(libdir)/ivl/vhdl.conf: vhdl.conf
-	$(INSTALL_DATA) $< $(libdir)/ivl/vhdl.conf
+	$(INSTALL_DATA) $< $(DESTDIR)$(libdir)/ivl/vhdl.conf
 
 installdirs: ../mkinstalldirs
-	$(srcdir)/../mkinstalldirs $(libdir)/ivl
+	$(srcdir)/../mkinstalldirs $(DESTDIR)$(libdir)/ivl
 
 uninstall:
-	rm -f $(libdir)/ivl/vhdl.tgt $(libdir)/ivl/vhdl.conf
+	rm -f $(DESTDIR)$(libdir)/ivl/vhdl.tgt $(DESTDIR)$(libdir)/ivl/vhdl.conf
 
 
 -include $(patsubst %.o, dep/%.d, $O)
diff --git a/tgt-vvp/Makefile.in b/tgt-vvp/Makefile.in
index 323212332..f3e8b9b0d 100644
--- a/tgt-vvp/Makefile.in
+++ b/tgt-vvp/Makefile.in
@@ -88,20 +88,20 @@ check: all
 install: all installdirs $(libdir)/ivl/vvp.tgt $(libdir)/ivl/vvp.conf $(libdir)/ivl/vvp-s.conf
 
 $(libdir)/ivl/vvp.tgt: ./vvp.tgt
-	$(INSTALL_PROGRAM) ./vvp.tgt $(libdir)/ivl/vvp.tgt
+	$(INSTALL_PROGRAM) ./vvp.tgt $(DESTDIR)$(libdir)/ivl/vvp.tgt
 
 $(libdir)/ivl/vvp.conf: vvp.conf
-	$(INSTALL_DATA) $< $(libdir)/ivl/vvp.conf
+	$(INSTALL_DATA) $< $(DESTDIR)$(libdir)/ivl/vvp.conf
 
 $(libdir)/ivl/vvp-s.conf: vvp-s.conf
-	$(INSTALL_DATA) $< $(libdir)/ivl/vvp-s.conf
+	$(INSTALL_DATA) $< $(DESTDIR)$(libdir)/ivl/vvp-s.conf
 
 
 installdirs: ../mkinstalldirs
-	$(srcdir)/../mkinstalldirs $(libdir)/ivl
+	$(srcdir)/../mkinstalldirs $(DESTDIR)$(libdir)/ivl
 
 uninstall:
-	rm -f $(libdir)/ivl/vvp.tgt $(libdir)/ivl/vvp.conf $(libdir)/ivl/vvp-s.conf
+	rm -f $(DESTDIR)$(libdir)/ivl/vvp.tgt $(DESTDIR)$(libdir)/ivl/vvp.conf $(DESTDIR)$(libdir)/ivl/vvp-s.conf
 
 
 -include $(patsubst %.o, dep/%.d, $O)
diff --git a/verilog.spec b/verilog.spec
index ed747afae..a96b1100d 100644
--- a/verilog.spec
+++ b/verilog.spec
@@ -1,6 +1,6 @@
 #norootforbuild
 #
-%define rev_date 20080429
+%define rev_date 20080830
 #
 #
 Summary: Icarus Verilog
@@ -41,11 +41,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 
-%attr(-,root,root) %doc COPYING README.txt BUGS.txt QUICK_START.txt ieee1364-notes.txt mingw.txt swift.txt netlist.txt t-dll.txt vpi.txt xnf.txt tgt-fpga/fpga.txt cadpli/cadpli.txt xilinx-hint.txt
+%attr(-,root,root) %doc COPYING README.txt BUGS.txt QUICK_START.txt ieee1364-notes.txt mingw.txt swift.txt netlist.txt t-dll.txt vpi.txt tgt-fpga/fpga.txt cadpli/cadpli.txt
 %attr(-,root,root) %doc examples/*
 
 %attr(-,root,root) %{_mandir}/man1/iverilog.1.gz
-#%attr(-,root,root) /usr/man/man1/iverilog-fpga.1.gz
 %attr(-,root,root) %{_mandir}/man1/iverilog-vpi.1.gz
 %attr(-,root,root) %{_mandir}/man1/vvp.1.gz
 
@@ -63,16 +62,19 @@ rm -rf $RPM_BUILD_ROOT
 %attr(-,root,root) %{_libdir}/ivl/vvp.tgt
 %attr(-,root,root) %{_libdir}/ivl/vvp.conf
 %attr(-,root,root) %{_libdir}/ivl/vvp-s.conf
-#%attr(-,root,root) %{_libdir}/ivl/fpga.tgt
-#%attr(-,root,root) %{_libdir}/ivl/fpga.conf
-#%attr(-,root,root) %{_libdir}/ivl/fpga-s.conf
-#%attr(-,root,root) %{_libdir}/ivl/xnf.conf
-#%attr(-,root,root) %{_libdir}/ivl/xnf-s.conf
+%attr(-,root,root) %{_libdir}/ivl/vhdl.tgt
+%attr(-,root,root) %{_libdir}/ivl/vhdl.conf
 %attr(-,root,root) %{_libdir}/ivl/system.sft
 %attr(-,root,root) %{_libdir}/ivl/system.vpi
+%attr(-,root,root) %{_libdir}/ivl/va_math.sft
+%attr(-,root,root) %{_libdir}/ivl/va_math.vpi
+%attr(-,root,root) %{_libdir}/ivl/v2005_math.sft
+%attr(-,root,root) %{_libdir}/ivl/v2005_math.vpi
 %attr(-,root,root) %{_libdir}/ivl/cadpli.vpl
 %attr(-,root,root) %{_libdir}/libvpi.a
 %attr(-,root,root) %{_libdir}/libveriuser.a
+%attr(-,root,root) %{_libdir}/ivl/include/constants.vams
+%attr(-,root,root) %{_libdir}/ivl/include/disciplines.vams
 %attr(-,root,root) /usr/include/ivl_target.h
 %attr(-,root,root) /usr/include/vpi_user.h
 %attr(-,root,root) /usr/include/acc_user.h
@@ -80,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(-,root,root) /usr/include/_pli_types.h
 
 %changelog -n verilog
+* Sat Aug 30 2008 - steve@icarus.com
+- Add vhdl target files
+- Add V/AMS header files.
+
 * Fri Jan 25 2008 - steve@icarus.com
 - Removed vvp32 support for x86_64 build.
 
diff --git a/vpi/Makefile.in b/vpi/Makefile.in
index 0b5c703ed..29701d77b 100644
--- a/vpi/Makefile.in
+++ b/vpi/Makefile.in
@@ -116,36 +116,35 @@ check: all
 install: all installdirs \
     $(vpidir)/system.vpi $(libdir)/ivl/system.sft \
     $(vpidir)/va_math.vpi $(libdir)/ivl/va_math.sft \
-    $(vpidir)/v2005_math.vpi $(libdir)/ivl/v2005_math.sft \
-    $(vpidir)/include/
+    $(vpidir)/v2005_math.vpi $(libdir)/ivl/v2005_math.sft
 
 $(vpidir)/system.vpi: ./system.vpi
-	$(INSTALL_PROGRAM) ./system.vpi $(vpidir)/system.vpi
+	$(INSTALL_PROGRAM) ./system.vpi $(DESTDIR)$(vpidir)/system.vpi
 
 $(libdir)/ivl/system.sft: system.sft
-	$(INSTALL_DATA) $< $@
+	$(INSTALL_DATA) $< $(DESTDIR)$@
 
 $(vpidir)/va_math.vpi: ./va_math.vpi
-	$(INSTALL_PROGRAM) ./va_math.vpi $(vpidir)/va_math.vpi
+	$(INSTALL_PROGRAM) ./va_math.vpi $(DESTDIR)$(vpidir)/va_math.vpi
 
 $(libdir)/ivl/va_math.sft: va_math.sft
-	$(INSTALL_DATA) $< $@
+	$(INSTALL_DATA) $< $(DESTDIR)$@
 
 $(vpidir)/v2005_math.vpi: ./v2005_math.vpi
-	$(INSTALL_PROGRAM) ./v2005_math.vpi $(vpidir)/v2005_math.vpi
+	$(INSTALL_PROGRAM) ./v2005_math.vpi $(DESTDIR)$(vpidir)/v2005_math.vpi
 
 $(libdir)/ivl/v2005_math.sft: v2005_math.sft
-	$(INSTALL_DATA) $< $@
+	$(INSTALL_DATA) $< $(DESTDIR)$@
 
 installdirs: ../mkinstalldirs
-	$(srcdir)/../mkinstalldirs $(vpidir)
+	$(srcdir)/../mkinstalldirs $(DESTDIR)$(libdir) $(DESTDIR)$(vpidir)
 
 uninstall:
-	rm -f $(vpidir)/system.vpi
-	rm -f $(libdir)/ivl/system.sft
-	rm -f $(vpidir)/va_math.vpi
-	rm -f $(libdir)/ivl/va_math.sft
-	rm -f $(vpidir)/v2005_math.vpi
-	rm -f $(libdir)/ivl/v2005_math.sft
+	rm -f $(DESTDIR)$(vpidir)/system.vpi
+	rm -f $(DESTDIR)$(libdir)/ivl/system.sft
+	rm -f $(DESTDIR)$(vpidir)/va_math.vpi
+	rm -f $(DESTDIR)$(libdir)/ivl/va_math.sft
+	rm -f $(DESTDIR)$(vpidir)/v2005_math.vpi
+	rm -f $(DESTDIR)$(libdir)/ivl/v2005_math.sft
 
 -include $(patsubst %.o, dep/%.d, $O)
diff --git a/vvp/Makefile.in b/vvp/Makefile.in
index ab1e8b227..a65994e6b 100644
--- a/vvp/Makefile.in
+++ b/vvp/Makefile.in
@@ -161,24 +161,24 @@ Makefile: Makefile.in config.status
 install: all installdirs $(bindir)/vvp@EXEEXT@ $(libdir)/libvpi.a $(INSTALL_DOC)
 
 $(bindir)/vvp@EXEEXT@: ./vvp@EXEEXT@
-	$(INSTALL_PROGRAM) ./vvp@EXEEXT@ $(bindir)/vvp@EXEEXT@
+	$(INSTALL_PROGRAM) ./vvp@EXEEXT@ $(DESTDIR)$(bindir)/vvp@EXEEXT@
 
 $(libdir)/libvpi.a : ./libvpi.a
-	$(INSTALL_DATA) libvpi.a $(libdir)/libvpi.a
+	$(INSTALL_DATA) libvpi.a $(DESTDIR)$(libdir)/libvpi.a
 
 $(mandir)/man1/vvp.1: $(srcdir)/vvp.man
-	$(INSTALL_DATA) $(srcdir)/vvp.man $(mandir)/man1/vvp.1
+	$(INSTALL_DATA) $(srcdir)/vvp.man $(DESTDIR)$(mandir)/man1/vvp.1
 
 $(prefix)/vvp.pdf: vvp.pdf
-	$(INSTALL_DATA) vvp.pdf $(prefix)/vvp.pdf
+	$(INSTALL_DATA) vvp.pdf $(DESTDIR)$(prefix)/vvp.pdf
 
 installdirs: $(srcdir)/mkinstalldirs
-	$(srcdir)/mkinstalldirs $(bindir) $(libdir) $(libdir) $(INSTALL_DOCDIR)
+	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(INSTALL_DOCDIR)
 
 
 uninstall: $(UNINSTALL32)
-	rm -f $(bindir)/vvp@EXEEXT@
-	rm -f $(libdir)/libvpi.a
-	rm -f $(mandir)/man1/vvp.1 $(prefix)/vvp.pdf
+	rm -f $(DESTDIR)$(bindir)/vvp@EXEEXT@
+	rm -f $(DESTDIR)$(libdir)/libvpi.a
+	rm -f $(DESTDIR)$(mandir)/man1/vvp.1 $(DESTDIR)$(prefix)/vvp.pdf
 
 -include $(patsubst %.o, dep/%.d, $O)