diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 9d19e36ad..eaa122621 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -32,9 +32,6 @@ pkgdata_PYTHON = \
 	ExportVCard.py\
 	ExportXml.py\
 	FamilyGroup.py\
-	GVFamilyLines.py \
-	GVHourGlass.py\
-	GVRelGraph.py\
 	ImportCsv.py\
 	ImportGedcom.py\
 	ImportGeneWeb.py\
diff --git a/src/plugins/GVFamilyLines.py b/src/plugins/graph/GVFamilyLines.py
similarity index 100%
rename from src/plugins/GVFamilyLines.py
rename to src/plugins/graph/GVFamilyLines.py
diff --git a/src/plugins/GVHourGlass.py b/src/plugins/graph/GVHourGlass.py
similarity index 100%
rename from src/plugins/GVHourGlass.py
rename to src/plugins/graph/GVHourGlass.py
diff --git a/src/plugins/GVRelGraph.py b/src/plugins/graph/GVRelGraph.py
similarity index 100%
rename from src/plugins/GVRelGraph.py
rename to src/plugins/graph/GVRelGraph.py
diff --git a/src/plugins/graph/Makefile.am b/src/plugins/graph/Makefile.am
new file mode 100644
index 000000000..104887472
--- /dev/null
+++ b/src/plugins/graph/Makefile.am
@@ -0,0 +1,23 @@
+# This is the src/plugins/graph level Makefile for Gramps
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+pkgdatadir = $(datadir)/@PACKAGE@/plugins/graph
+
+pkgdata_PYTHON = \
+	GVFamilyLines.py \
+	GVHourGlass.py \
+	GVRelGraph.py
+
+pkgpyexecdir = @pkgpyexecdir@/plugins/graph
+pkgpythondir = @pkgpythondir@/plugins/graph
+
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+GRAMPS_PY_MODPATH = "../../"
+
+pycheck: 
+	(export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+	pychecker $(pkgdata_PYTHON));