diff --git a/lists/index.html b/lists/index.html
deleted file mode 100644
index 9ebdaae..0000000
--- a/lists/index.html
+++ /dev/null
@@ -1,80 +0,0 @@
----
-layout: default
-title: Mailing Lists
----
-
-          <br />
-          <br />
-
-          <h3>Mailing Lists</h3>
-
-          <p>This page contains all of the information needed in order to subscribe or unsubscribe from the mailing lists, along
-          with the general guidelines that should be followed when posting messages.</p>
-
-          <p>Listed below are the currently available Window Maker mailing lists. We have switched our list software over to
-          <a href="http://liw.iki.fi/liw/eoc/index.html">Enemies of Carlotta</a>. <a href="http://www.mhonarc.org/">MHonArc</a>
-          enables us to provide web-based archives to our users. Selecting a link under the Name field will bring up more details
-          and instructions regarding that specific list.</p>
-
-          <table border="1" align="center">
-            <col />
-            <col />
-
-            <thead>
-              <tr>
-                <th>NAME</th>
-
-                <th>DESCRIPTION</th>
-
-                <th>Mail Archive</th>
-              </tr>
-            </thead>
-
-            <tbody>
-              <tr>
-                <td><a href="wmaker-dev.html">wmaker-dev</a></td>
-
-                <td>Development discussion about the Window Maker window manager</td>
-
-                <td><a href="https://www.mail-archive.com/wmaker-dev@lists.windowmaker.org/">wmaker-dev Archives</a></td>
-              </tr>
-
-              <tr>
-                <td><a href="wmaker-user.html">wmaker-user</a></td>
-
-                <td>User discussion about the Window Maker window manager</td>
-
-                <td><a href="https://www.mail-archive.com/wmaker-user@lists.windowmaker.org/">wmaker-user Archives</a></td>
-              </tr>
-            </tbody>
-          </table>
-
-          <p>The following rules of etiquette are to be followed when posting to any of the lists:</p>
-
-          <ul>
-            <li>
-              <p>Do not <a href="http://www.idallen.com/topposting.html">top post</a>.</p>
-            </li>
-
-            <li>
-              <p>Use of excessive quoting in E-mail replies is frowned upon.</p>
-            </li>
-
-            <li>
-              <p>HTML messages and non-text attachments will be rejected.</p>
-            </li>
-
-            <li style="list-style: none; display: inline">
-              <p>Please consider reading some of our <a href="{{ site.baseurl }}/docs">documentation</a> before posting questions to the lists.
-              The Window Maker source code comes with a README, INSTALL, and NEWS file. There is also a <a href="{{ site.baseurl }}/docs/FAQ.html">FAQ</a>
-              to read.</p>
-            </li>
-
-            <li>
-              <p>Please, please, and pretty please <strong>THINK</strong> before you post. Try very hard not to intentionally
-              provoke others and cause flame-wars. We reserve the right to unsubscribe and ban any user that has a history of
-              causing trouble.<br />
-              <br />
-              <br /></p>
-            </li>
-          </ul>
diff --git a/lists/index.md b/lists/index.md
new file mode 100644
index 0000000..6f56ace
--- /dev/null
+++ b/lists/index.md
@@ -0,0 +1,56 @@
+---
+layout: default
+title: Mailing Lists
+---
+
+Mailing Lists
+=============
+This page contains all of the information needed in order to subscribe or
+unsubscribe from the mailing lists, along with the general guidelines that
+should be followed when posting messages.
+
+Listed below are the currently available Window Maker mailing lists. We have
+switched our list over to [Google Groups](https://groups.google.com).
+
+Window Maker Developer List
+---------------------------
+The Window Maker developer list is aimed at developers and others interested in
+the inner workings of Window Maker.
+
+* Web: <https://groups.google.com/forum/#!forum/wmaker-dev>
+* Email: <wmaker-dev@googlegroups.com>
+* Pre-Google Groups archive:
+  <https://www.mail-archive.com/wmaker-dev@lists.windowmaker.org>
+
+Window Maker User List
+----------------------
+
+The Window Maker user list is aimed at the end user for questions, tips,
+suggestions and general discussion.
+
+* Web: <https://groups.google.com/forum/#!forum/wmaker-user>
+* Email: <wmaker-user@googlegroups.com>
+* Pre-Google Groups archive:
+  <https://www.mail-archive.com/wmaker-user@lists.windowmaker.org>
+
+Subscribe/Unsubscribe
+---------------------
+Please see the [Google Groups
+documentation](https://support.google.com/groups/?hl=en#topic=2458613).
+
+Etiquette
+---------
+
+The following rules of etiquette are to be followed when posting to any of the
+lists:
+
+* Do not [top post](http://www.idallen.com/topposting.html).
+* Use of excessive quoting in E-mail replies is frowned upon.
+* HTML messages and non-text attachments will be rejected.
+* Please consider reading some of our [documentation]({{ site.baseurl }}/docs)
+  before posting questions to the lists.  The Window Maker source code comes
+  with a README, INSTALL, and NEWS file. There is also a
+  [FAQ]({{ site.baseurl }}/docs/FAQ.html) to read.
+* Please, please, and pretty please **THINK** before you post. Try very hard not
+  to intentionally provoke others and cause flame-wars. We reserve the right to
+  unsubscribe and ban any user that has a history of causing trouble.
diff --git a/lists/wmaker-dev.html b/lists/wmaker-dev.html
deleted file mode 100644
index f6cae41..0000000
--- a/lists/wmaker-dev.html
+++ /dev/null
@@ -1,29 +0,0 @@
----
-layout: default
-title: Developer List
----
-          <br />
-          <br />
-
-          <h3>Window Maker Developer List</h3>
-
-          <h2>Overview</h2>
-
-          <p>Window Maker Developer List is aimed at developers and others interested in the inner workings of Window Maker.</p>
-
-          <h2>Subscribe</h2>
-
-          <p>Send an email to <a href=
-          "mailto:wmaker-dev-subscribe@lists.windowmaker.org">wmaker-dev-subscribe@lists.windowmaker.org</a></p>
-
-          <p>You will get an email back to verify your address, reply and you are subscribed.</p>
-
-          <h2>Unsubscribe</h2>
-
-          <p>Send an email to <a href=
-          "mailto:wmaker-dev-unsubscribe@lists.windowmaker.org">wmaker-dev-unsubscribe@lists.windowmaker.org</a> from the address
-          you are subscribed.</p>
-
-          <h2>Archives</h2>
-
-          <p>The list is archived at <a href="http://lists.windowmaker.org/dev/">http://lists.windowmaker.org/dev/</a></p>
diff --git a/lists/wmaker-user.html b/lists/wmaker-user.html
deleted file mode 100644
index d311fb3..0000000
--- a/lists/wmaker-user.html
+++ /dev/null
@@ -1,29 +0,0 @@
----
-layout: default
-title: User List
----
-          <br />
-          <br />
-
-          <h3>Window Maker User List</h3>
-
-          <h2>Overview</h2>
-
-          <p>Window Maker User List is aimed at the end user for questions, tips, suggestions and general discussion.</p>
-
-          <h2>Subscribe</h2>
-
-          <p>Send an email to <a href=
-          "mailto:wmaker-user-subscribe@lists.windowmaker.org">wmaker-user-subscribe@lists.windowmaker.org</a></p>
-
-          <p>You will get an email back to verify your address, reply and you are subscribed.</p>
-
-          <h2>Unsubscribe</h2>
-
-          <p>Send an email to <a href=
-          "mailto:wmaker-user-unsubscribe@lists.windowmaker.org">wmaker-user-unsubscribe@lists.windowmaker.org</a> from the
-          address you are subscribed.</p>
-
-          <h2>Archives</h2>
-
-          <p>The list is archived at <a href="http://lists.windowmaker.org/user/">http://lists.windowmaker.org/user/</a></p>