diff --git a/_topic_map.yml b/_topic_map.yml
index d1f8b63..feb6ba9 100644
--- a/_topic_map.yml
+++ b/_topic_map.yml
@@ -26,8 +26,8 @@ Topics:
     File: create-gpg-keys
   - Name: (FIX ME!) How to create a GNU Hello RPM package
     File: create-hello-world-rpm
-  - Name: (FIX ME!) How to create xorg.conf
-    File: create-xorg-conf
+  - Name: Creating an xorg.conf file
+    File: create-xorg-conf.adoc
   - Name: (FIX ME!) How to debug Dracut problems
     File: debug-dracut-problems
   - Name: (FIX ME!) How to debug Systemd problems
diff --git a/en-US/create-xorg-conf.adoc b/en-US/create-xorg-conf.adoc
index bda4c30..b331d14 100644
--- a/en-US/create-xorg-conf.adoc
+++ b/en-US/create-xorg-conf.adoc
@@ -1,64 +1,9 @@
-= How to create xorg.conf
+[[xorg-conf]]
+= The xorg.conf file
 
-'''
+include::{md}/concept_xorg-conf.adoc[leveloffset=+1]
 
-[IMPORTANT]
-======
-
-This page was automatically converted from https://fedoraproject.org/wiki/How_to_create_xorg.conf
-
-It is probably
-
-* Badly formatted
-* Missing graphics and tables that do not convert well from mediawiki
-* Out-of-date
-* In need of other love
-
-Please fix it, remove this notice, and then add to `_topic_map.yml`
-
-Pull requests accepted at https://pagure.io/fedora-docs/quick-docs
-
-Once that is live, go to the original wiki page and add an `{{old}}`
-tag, followed by a note like
-
-....
-{{admon/note|This page has a new home!|
-This wiki page is no longer maintained. Please find the up-to-date
-version at: https://docs.fedoraproject.org/whatever-the-url
-}}
-....
-
-======
-
-'''
-
-
-Fedora releases since do not create a file, used to configure the X
-server, by default. The X configuration is automatically determined each
-time X is started. In most cases, this works well and there is no need
-to manually specify X configuration information.
-
-If you need to make manual changes to X configuration for any reason,
-you will first need to create a file.
-
-[[xorg--configure]]
-Xorg -configure
-~~~~~~~~~~~~~~~
-
-You can create a basic using the X executable itself. As root run:
-
-....
-Xorg :1 -configure
-....
-
-This will create the file , which you can then copy to :
-
-....
-cp /root/xorg.conf.new /etc/X11/xorg.conf
-....
-
-and edit according to your needs.
-'''
+include::{md}/proc_creating_xorg_conf.adoc[leveloffset=+1]
 
 See a typo, something missing or out of date, or anything else which can be
 improved? Edit this document at https://pagure.io/fedora-docs/quick-docs.
diff --git a/en-US/modules/concept_xorg-conf.adoc b/en-US/modules/concept_xorg-conf.adoc
new file mode 100644
index 0000000..f7e3525
--- /dev/null
+++ b/en-US/modules/concept_xorg-conf.adoc
@@ -0,0 +1,7 @@
+Traditionally, the xorg.conf file is used to configure the X server. In Fedora,
+the X configuration is determined automatically each time X is started. As a
+result, no xorg.conf file is created. In most cases, this works well and there
+is no need to manually specify X configuration.
+
+If you need to make manual changes to your X configuration for any reason,
+you will first need to create an xorg.conf file.
\ No newline at end of file
diff --git a/en-US/modules/proc_creating_xorg_conf.adoc b/en-US/modules/proc_creating_xorg_conf.adoc
new file mode 100644
index 0000000..d079f82
--- /dev/null
+++ b/en-US/modules/proc_creating_xorg_conf.adoc
@@ -0,0 +1,18 @@
+[[creating-an-xorg-conf-file]]
+== Creating an Xorg.conf file
+
+You can create a basic file using the X executable. It will contain sections
+and entries that you can edit to suit your needs. To create the file,
+enter this command as root:
+[bash,subs="attributes+"]
+----
+Xorg :1 -configure
+----
+
+Next, copy the file to the correct location:
+[bash,subs="attributes+"]
+----
+cp /root/xorg.conf.new /etc/X11/xorg.conf
+----
+
+Now you may edit the file according to your needs.
\ No newline at end of file