diff --git a/Makefile.am b/Makefile.am
index 8f10a3ee..8a1a5009 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@ EXTRA_DIST = \
 splashdir = $(pkgdatadir)/splash
 splash_DATA = splash.png
 
-SUBDIRS = src data extras textures models shaders fonts po po2 locale scripts
+SUBDIRS = src data extras extras-standard textures models shaders fonts po po2 locale scripts
 
 # Non-automake directories
 NONAUTO = macosx
diff --git a/configure.in b/configure.in
index b5508985..e738925e 100644
--- a/configure.in
+++ b/configure.in
@@ -440,6 +440,20 @@ AC_CONFIG_FILES([ src/celengine/Makefile ])
 AC_CONFIG_FILES([ src/celestia/Makefile ])
 AC_CONFIG_FILES([ data/Makefile ])
 AC_CONFIG_FILES([ extras/Makefile ])
+AC_CONFIG_FILES([ extras-standard/Makefile ])
+AC_CONFIG_FILES([ extras-standard/cassini/Makefile ])
+AC_CONFIG_FILES([ extras-standard/cassini/models/Makefile ])
+AC_CONFIG_FILES([ extras-standard/cassini/data/Makefile ])
+AC_CONFIG_FILES([ extras-standard/mir/Makefile ])
+AC_CONFIG_FILES([ extras-standard/mir/models/Makefile ])
+AC_CONFIG_FILES([ extras-standard/galileo/Makefile ])
+AC_CONFIG_FILES([ extras-standard/galileo/models/Makefile ])
+AC_CONFIG_FILES([ extras-standard/hubble/Makefile ])
+AC_CONFIG_FILES([ extras-standard/hubble/models/Makefile ])
+AC_CONFIG_FILES([ extras-standard/iss/Makefile ])
+AC_CONFIG_FILES([ extras-standard/iss/models/Makefile ])
+AC_CONFIG_FILES([ extras-standard/iss/textures/Makefile ])
+AC_CONFIG_FILES([ extras-standard/iss/textures/medres/Makefile ])
 AC_CONFIG_FILES([ textures/Makefile ])
 AC_CONFIG_FILES([ textures/lores/Makefile ])
 AC_CONFIG_FILES([ textures/medres/Makefile ])
diff --git a/extras-standard/Makefile.am b/extras-standard/Makefile.am
new file mode 100644
index 00000000..85c89667
--- /dev/null
+++ b/extras-standard/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = cassini galileo hubble iss mir
diff --git a/extras-standard/cassini/Makefile.am b/extras-standard/cassini/Makefile.am
new file mode 100644
index 00000000..4e9ccc88
--- /dev/null
+++ b/extras-standard/cassini/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS = data models
+
+pkgdatadir = @datadir@/@PACKAGE@/extras-standard/cassini
+
+pkgdata_DATA = cassini.ssc
+
+EXTRA_DIST = $(pkgdata_DATA)
diff --git a/extras-standard/cassini/data/Makefile.am b/extras-standard/cassini/data/Makefile.am
new file mode 100644
index 00000000..808a1545
--- /dev/null
+++ b/extras-standard/cassini/data/Makefile.am
@@ -0,0 +1,5 @@
+pkgdatadir = @datadir@/@PACKAGE@/extras-standard/cassini/data
+
+pkgdata_DATA = cassini-cruise.xyzv cassini-orbit.xyzv
+
+EXTRA_DIST = $(pkgdata_DATA)
diff --git a/extras-standard/cassini/models/Makefile.am b/extras-standard/cassini/models/Makefile.am
new file mode 100644
index 00000000..33f58dc7
--- /dev/null
+++ b/extras-standard/cassini/models/Makefile.am
@@ -0,0 +1,5 @@
+pkgdatadir = @datadir@/@PACKAGE@/extras-standard/cassini/models
+
+pkgdata_DATA = cassini.3ds huygens.3ds
+
+EXTRA_DIST = $(pkgdata_DATA)
diff --git a/extras-standard/galileo/Makefile.am b/extras-standard/galileo/Makefile.am
new file mode 100644
index 00000000..9ba06497
--- /dev/null
+++ b/extras-standard/galileo/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS = models
+
+pkgdatadir = @datadir@/@PACKAGE@/extras-standard/galileo
+
+pkgdata_DATA = galileo.ssc
+
+EXTRA_DIST = $(pkgdata_DATA)
diff --git a/extras-standard/galileo/models/Makefile.am b/extras-standard/galileo/models/Makefile.am
new file mode 100644
index 00000000..d5de28e6
--- /dev/null
+++ b/extras-standard/galileo/models/Makefile.am
@@ -0,0 +1,5 @@
+pkgdatadir = @datadir@/@PACKAGE@/extras-standard/galileo/models
+
+pkgdata_DATA = galileo.3ds
+
+EXTRA_DIST = $(pkgdata_DATA)
diff --git a/extras-standard/hubble/Makefile.am b/extras-standard/hubble/Makefile.am
new file mode 100644
index 00000000..19705b19
--- /dev/null
+++ b/extras-standard/hubble/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS = models
+
+pkgdatadir = @datadir@/@PACKAGE@/extras-standard/hubble
+
+pkgdata_DATA = hubble.ssc
+
+EXTRA_DIST = $(pkgdata_DATA)
diff --git a/extras-standard/hubble/models/Makefile.am b/extras-standard/hubble/models/Makefile.am
new file mode 100644
index 00000000..c39e11ff
--- /dev/null
+++ b/extras-standard/hubble/models/Makefile.am
@@ -0,0 +1,5 @@
+pkgdatadir = @datadir@/@PACKAGE@/extras-standard/hubble/models
+
+pkgdata_DATA = hubble.cmod
+
+EXTRA_DIST = $(pkgdata_DATA)
diff --git a/extras-standard/iss/Makefile.am b/extras-standard/iss/Makefile.am
new file mode 100644
index 00000000..e0b5e7ce
--- /dev/null
+++ b/extras-standard/iss/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS = models textures
+
+pkgdatadir = @datadir@/@PACKAGE@/extras-standard/iss
+
+pkgdata_DATA = iss.ssc
+
+EXTRA_DIST = $(pkgdata_DATA)
diff --git a/extras-standard/iss/models/Makefile.am b/extras-standard/iss/models/Makefile.am
new file mode 100644
index 00000000..f31e53f2
--- /dev/null
+++ b/extras-standard/iss/models/Makefile.am
@@ -0,0 +1,5 @@
+pkgdatadir = @datadir@/@PACKAGE@/extras-standard/iss/models
+
+pkgdata_DATA = iss.cmod
+
+EXTRA_DIST = $(pkgdata_DATA)
diff --git a/extras-standard/iss/textures/Makefile.am b/extras-standard/iss/textures/Makefile.am
new file mode 100644
index 00000000..8a6605e9
--- /dev/null
+++ b/extras-standard/iss/textures/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = medres
diff --git a/extras-standard/iss/textures/medres/Makefile.am b/extras-standard/iss/textures/medres/Makefile.am
new file mode 100644
index 00000000..fff8acd7
--- /dev/null
+++ b/extras-standard/iss/textures/medres/Makefile.am
@@ -0,0 +1,41 @@
+pkgdatadir = @datadir@/@PACKAGE@/extras-standard/iss/textures/medres
+
+pkgdata_DATA = \
+	d_ring.jpg \
+	graple.jpg \
+	issb2.jpg \
+	issb3.jpg \
+	issb4.jpg \
+	issb.jpg \
+	issbs.jpg \
+	issbso2.jpg \
+	issbso.jpg \
+	isscov2.jpg \
+	isscover.jpg \
+	isscup.jpg \
+	iss_dc.jpg \
+	iss_dcs.jpg \
+	issdish.jpg \
+	issdot.jpg \
+	issesa.jpg \
+	isshand.jpg \
+	issins.jpg \
+	issku1.jpg \
+	issku2.jpg \
+	issku.jpg \
+	issmb.jpg \
+	issmod.jpg \
+	issp2.jpg \
+	isspanel.jpg \
+	issrad.jpg \
+	issred.jpg \
+	isssolar.jpg \
+	iss_un.jpg \
+	issusaf.jpg \
+	issusa.jpg \
+	isszmod.jpg \
+	metalcon.jpg \
+	nasda.jpg \
+	questcov.jpg
+
+EXTRA_DIST = $(pkgdata_DATA)
diff --git a/extras-standard/mir/Makefile.am b/extras-standard/mir/Makefile.am
new file mode 100644
index 00000000..95d4cb79
--- /dev/null
+++ b/extras-standard/mir/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS = models
+
+pkgdatadir = @datadir@/@PACKAGE@/extras-standard/mir
+
+pkgdata_DATA = mir.ssc
+
+EXTRA_DIST = $(pkgdata_DATA)
diff --git a/extras-standard/mir/models/Makefile.am b/extras-standard/mir/models/Makefile.am
new file mode 100644
index 00000000..380d82c2
--- /dev/null
+++ b/extras-standard/mir/models/Makefile.am
@@ -0,0 +1,5 @@
+pkgdatadir = @datadir@/@PACKAGE@/extras-standard/mir/models
+
+pkgdata_DATA = mir.3ds
+
+EXTRA_DIST = $(pkgdata_DATA)