3 files changed, 27 insertions, 3 deletions
diff --git a/hurd/running.mdwn b/hurd/running.mdwn
index 470b5f0b..f0058625 100644
--- a/hurd/running.mdwn
+++ b/hurd/running.mdwn
@@ -1,4 +1,5 @@
-[[!meta copyright="Copyright © 2007, 2008 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2007, 2008, 2009 Free Software Foundation,
+Inc."]]
 
 [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
 id="license" text="Permission is granted to copy, distribute and/or modify this
@@ -17,4 +18,6 @@ There are several different ways to run a GNU/Hurd system:
 * [[vmware]] (**non-free!**)
 * [[FlashHurd]] - From a flash stick
 
+* [[FAQ]]
+
 * [[Public_hurd_boxen]]
diff --git a/hurd/running/debian/faq.mdwn b/hurd/running/debian/faq.mdwn
index 4966456a..b3bd230d 100644
--- a/hurd/running/debian/faq.mdwn
+++ b/hurd/running/debian/faq.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 2007 Free Software Foundation, Inc."]]
+[[!meta copyright="Copyright © 2007, 2009 Free Software Foundation, Inc."]]
 
 [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
 id="license" text="Permission is granted to copy, distribute and/or modify this
@@ -10,7 +10,8 @@ is included in the section entitled
 
 [[!meta title="Debian GNU/Hurd FAQ"]]
 
-See also the [[Hurd_FAQ|hurd/FAQ]] and [[after_install]].
+See also the [[Hurd_FAQ|/hurd/FAQ]], [[after_install]], and the [[General FAQ
+About Running GNU/Hurd|/hurd/running/faq]].
 
 [[!inline
 pages="hurd/running/debian/faq/* and !*/discussion"
diff --git a/hurd/running/faq.mdwn b/hurd/running/faq.mdwn
new file mode 100644
index 00000000..a59bce7e
--- /dev/null
+++ b/hurd/running/faq.mdwn
@@ -0,0 +1,20 @@
+[[!meta copyright="Copyright © 2009 Free Software Foundation, Inc."]]
+
+[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
+id="license" text="Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no Invariant
+Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license
+is included in the section entitled [[GNU Free Documentation
+License|/fdl]]."]]"""]]
+
+[[!meta title="General FAQ About Running GNU/Hurd"]]
+
+See also the [[Hurd FAQ|hurd/FAQ]], and the [[Debian GNU/Hurd FAQ|debian/faq]].
+
+[[!inline
+pages="hurd/running/faq/* and !*/discussion"
+show=0
+feeds=no
+actions=yes
+rootpage="hurd/running/faq" postformtext="Add a new item titled:"]]