diff --git a/Makefile.am b/Makefile.am
index 2e34a7a33..1d204fd58 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = @XGRAPHDIR@ src man tests
-DIST_SUBDIRS = @XGRAPHDIR@ src man tests
+SUBDIRS = src man tests
+DIST_SUBDIRS = src man tests
 
 EXTRA_DIST = FAQ autogen.sh Stuarts_Poly_Notes  \
 		ANALYSES BUGS AUTHORS ChangeLog \
 		DEVICES NEWS README README.tcl \
 		README.shared-xspice README.vdmos \
 		README.adms README-old.adms contrib \
-		examples m4 visualc @NOTXGRAPH@ \
-		xgraph/aclocal.m4 \
+		examples m4 visualc \
 		build-for-mac-os.sh \
 		cross-compile.sh cross-compile-shared.sh \
 		compile_min.sh compile_linux.sh compile_min_shared.sh \
@@ -27,12 +26,6 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = ngspice.pc
 endif SHARED_MODULE
 
-dist-hook:
-	rm -rf `find $(distdir)/xgraph -name .deps`
-	rm -rf `find $(distdir)/xgraph -name config.status`
-	rm -rf `find $(distdir)/xgraph -name config.log`
-	rm -rf `find $(distdir)/xgraph -name Makefile`
-
 mrproper: maintainer-clean
 	rm -f `find $(top_srcdir) -type f -name "*~" -print`
 	rm -f `find $(top_srcdir) -type f -name "*.orig" -print`