diff --git a/.gitmodules b/.gitmodules
index e69de29bb2..75913d647c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "plugins-custom"]
+	path = plugins-custom
+	url = https://git.vvvvvvaria.org/varia/plugins-custom
+[submodule "pelican-plugins"]
+	path = pelican-plugins
+	url = https://github.com/getpelican/pelican-plugins
diff --git a/README.md b/README.md
index 7f7e4544f5..682ec02090 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,8 @@ The folder 'plugins' is linked to the Pelican project '[pelican-plugins](https:/
 
 We are currently using two submodules:
 
-* plugins ([https://github.com/getpelican/pelican-plugins](https://github.com/getpelican/pelican-plugins))
-* plugins-custom ([https://git.vvvvvvaria.org/rra/plugins-custom](https://git.vvvvvvaria.org/rra/plugins-custom)) 
+* pelican-plugins ([https://github.com/getpelican/pelican-plugins](https://github.com/getpelican/pelican-plugins))
+* plugins-custom ([https://git.vvvvvvaria.org/varia/plugins-custom](https://git.vvvvvvaria.org/varia/plugins-custom)) 
 
 To update these submodules within your (already) cloned repository, first init the submodule, and then update it:
 
diff --git a/pelican-plugins b/pelican-plugins
new file mode 160000
index 0000000000..8de8e847ce
--- /dev/null
+++ b/pelican-plugins
@@ -0,0 +1 @@
+Subproject commit 8de8e847ce78e53b62dfdcd7e0e1923614adead5
diff --git a/pelicanconf.py b/pelicanconf.py
index 8c01077468..5a745b6ca2 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -29,7 +29,7 @@ AUTHOR_FEED_RSS = None
 DEFAULT_PAGINATION = 25
 
 # Uncomment following line if you want document-relative URLs when developing
-PLUGIN_PATHS = ['./plugins', './plugins-custom']
+PLUGIN_PATHS = ['./pelican-plugins', './plugins-custom']
 PLUGINS = ['dateish','extract_toc', 'i18n_subsites', 'summary', 'events_ics'] 
 MD_EXTENSIONS = ['codehilite','extra','toc']
 
diff --git a/plugins-custom b/plugins-custom
new file mode 160000
index 0000000000..466d35a876
--- /dev/null
+++ b/plugins-custom
@@ -0,0 +1 @@
+Subproject commit 466d35a876bceae4b8a3429b0121703ba8366067