diff --git a/.gitignore b/.gitignore
index b4d8ebea..f83441ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ coverage/
 cscope.*
 data/check-update.service
 data/swupd-update.service
+docs/*.html
 depcomp
 functional-tests.log
 fuzzout/
diff --git a/Makefile.am b/Makefile.am
index 2618a97f..5ac44240 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -216,3 +216,21 @@ release:
 	fi
 	@git tag -a -m "$(PACKAGE_NAME) release $(PACKAGE_VERSION)" v$(PACKAGE_VERSION)
 	@printf "\nNew release $(PACKAGE_VERSION) tagged!\n\n"
+
+
+MANPAGES = \
+	docs/swupd.1 \
+	docs/check-update.service.4 \
+	docs/check-update.timer.4 \
+	docs/swupd-update.service.4 \
+	docs/swupd-update.timer.4 \
+	docs/update-triggers.target.4
+
+manpages:
+	for MANPAGE in $(MANPAGES); do \
+		ronn --roff < $${MANPAGE}.md > $${MANPAGE}; \
+		ronn --html < $${MANPAGE}.md > $${MANPAGE}.html; \
+	done
+
+dist_man_MANS = \
+	$(MANPAGES)
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 00000000..24b8f2aa
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,8 @@
+
+## Notes on manual pages
+
+The manual pages are generated using `ronn(1)`. To recreate them,
+run `make manpages` in the toplevel  folder. If you want to edit
+the documentation for upstream changes, make sure to edit the `*.md`
+files and not the shipped nroff output files.
+
diff --git a/docs/check-update.service.4.md b/docs/check-update.service.4.md
new file mode 100644
index 00000000..bfe5d902
--- /dev/null
+++ b/docs/check-update.service.4.md
@@ -0,0 +1,33 @@
+check-update.service(4) -- System Unit
+==================================
+
+## SYNOPSIS
+
+`check-update.service`
+`/usr/lib/systemd/system/check-update.service`
+
+## DESCRIPTION
+
+Instructs the `systemd(1)` system daemon how to start and control the
+`swupd` service to perform an update check.
+
+When this unit runs, the output will be sent to the systemd journal, and
+it can be inspected with the `journalctl(1)` command.
+
+## ENVIRONMENT
+
+This unit is a `systemd(1)` unit file.
+
+## COPYRIGHT
+
+ * Copyright (C) 2016 Intel Corporation, License: CC-BY-SA-3.0
+
+## SEE ALSO
+
+`swupd(1)`, `check-update.timer(4)`
+
+## NOTES
+
+Creative Commons Attribution-ShareAlike 3.0 Unported
+
+ * http://creativecommons.org/licenses/by-sa/3.0/
diff --git a/docs/check-update.timer.4.md b/docs/check-update.timer.4.md
new file mode 100644
index 00000000..bfe5d902
--- /dev/null
+++ b/docs/check-update.timer.4.md
@@ -0,0 +1,33 @@
+check-update.service(4) -- System Unit
+==================================
+
+## SYNOPSIS
+
+`check-update.service`
+`/usr/lib/systemd/system/check-update.service`
+
+## DESCRIPTION
+
+Instructs the `systemd(1)` system daemon how to start and control the
+`swupd` service to perform an update check.
+
+When this unit runs, the output will be sent to the systemd journal, and
+it can be inspected with the `journalctl(1)` command.
+
+## ENVIRONMENT
+
+This unit is a `systemd(1)` unit file.
+
+## COPYRIGHT
+
+ * Copyright (C) 2016 Intel Corporation, License: CC-BY-SA-3.0
+
+## SEE ALSO
+
+`swupd(1)`, `check-update.timer(4)`
+
+## NOTES
+
+Creative Commons Attribution-ShareAlike 3.0 Unported
+
+ * http://creativecommons.org/licenses/by-sa/3.0/
diff --git a/docs/swupd-update.service.4.md b/docs/swupd-update.service.4.md
new file mode 100644
index 00000000..5ec02c95
--- /dev/null
+++ b/docs/swupd-update.service.4.md
@@ -0,0 +1,38 @@
+swupd-update.service(4) -- System Unit
+==================================
+
+## SYNOPSIS
+
+`swupd-update.service`
+`/usr/lib/systemd/system/swupd-update.service`
+
+## DESCRIPTION
+
+Instructs the `systemd(1)` system daemon how to start and control the
+`swupd` service to perform an update.
+
+When this unit runs, the output will be sent to the systemd journal, and
+it can be inspected with the `journalctl(1)` command.
+
+The user can disable all background updates (either started through
+timers or not) by executing the following command:
+
+`systemctl mask swupd-update.service`
+
+## ENVIRONMENT
+
+This unit is a `systemd(1)` unit file.
+
+## COPYRIGHT
+
+ * Copyright (C) 2016 Intel Corporation, License: CC-BY-SA-3.0
+
+## SEE ALSO
+
+`swupd(1)`, `swupd-update.timer(4)`
+
+## NOTES
+
+Creative Commons Attribution-ShareAlike 3.0 Unported
+
+ * http://creativecommons.org/licenses/by-sa/3.0/
diff --git a/docs/swupd-update.timer.4.md b/docs/swupd-update.timer.4.md
new file mode 100644
index 00000000..7d6ba985
--- /dev/null
+++ b/docs/swupd-update.timer.4.md
@@ -0,0 +1,32 @@
+swupd-update.timer(4) -- System Unit
+==================================
+
+## SYNOPSIS
+
+`swupd-update.timer`
+`/usr/lib/systemd/system/swupd-update.timer`
+
+## DESCRIPTION
+
+Instructs the `systemd(1)` system daemon when to periodically start a
+system software update. The update itself may not execute if the
+`swupd-update.service(4)` is disabled. See that manual page for
+information on how to disable that unit.
+
+## ENVIRONMENT
+
+This unit is a `systemd(1)` unit file.
+
+## COPYRIGHT
+
+ * Copyright (C) 2016 Intel Corporation, License: CC-BY-SA-3.0
+
+## SEE ALSO
+
+`swupd(1)`, `swupd-update.service(4)`
+
+## NOTES
+
+Creative Commons Attribution-ShareAlike 3.0 Unported
+
+ * http://creativecommons.org/licenses/by-sa/3.0/
diff --git a/docs/swupd.1.md b/docs/swupd.1.md
new file mode 100644
index 00000000..0fdbe2c8
--- /dev/null
+++ b/docs/swupd.1.md
@@ -0,0 +1,255 @@
+swupd(1) -- OS software update program
+==================================
+
+
+## SYNOPSIS
+
+`swupd [subcommand] <flags>`
+
+
+## DESCRIPTION
+
+`swupd(1)` is an OS-level software update program that applies updates
+to system software.
+
+The updates are fetched from a central software update server. If a
+valid update is found on the server, it can be downloaded and applied.
+
+The `swupd` tool can also install and remove bundles, check for updates
+without applying them, and perform system-level verification of the
+system software.
+
+A *version url* server provides version information. This server notifies
+the program of available updates.
+
+A *content url* server (can be the same as *version url* server) provides
+the file and metadata content for all versions. The content url server
+provides metadata in the form of manifests. These Manifest files list and
+describe file contents, symlinks, directories. Additionally, the actual
+content is provided to clients in the form of archive files.
+
+
+## OPTIONS
+
+The following options are applicable to most subcommands, and can be used
+to modify the core behavior and resources that swupd uses.
+
+ * `-h, --help`
+
+   Display general help information. If put after a subcommand, it will
+   display help specific to that subcommand.
+
+ * `-v, --version`
+
+   Displays the version information of the swupd program, and exit. It
+   also displays compile options and copyright information.
+
+ * `-u, --url={url}`
+
+    Specify an RFC-3986 encoded url. The url will be used to download
+    version information and file content downloads.
+
+ * `-c, --contenturl={url}`
+
+    Specify an RFC-3986 encoded url. The url will be used for file content
+    downloads only.
+
+ * `-v, --versionurl={url}`
+
+    Specify an RFC-3986 encoded url. The url will be used to download
+    version information.
+
+ * `-P, --port={port}`
+
+    Specify the port number of the server to connect to. Applies to both
+    version and file content url server connections.
+
+ * `-p, --path={path}`
+
+    Specify the path to use for operations. This can be used to point to
+    a chroot installation of the OS or a custom mount.
+
+ * `-F, --format={formatstring}`
+
+    Specify the format suffix for version file downloads. Is usually one
+    of `1`, `2`, `3`, etc. or `staging`. Software update formats may change
+    regularly and normally you should consult the swupd server data for
+    the appropriate latest version available. If that version is not
+    supported by your version of `swupd`, you should subtract `1` from the
+    number and try again until it succeeds.
+
+ *  `-f, --force`
+
+    Forces completion of swupd beyond critical failures. This may ignore
+    filesystem errors, configuration errors and other errors which are
+    considered fatal, and could damage an installation if not addressed
+    properly.
+
+ *  `-S, --statedir={path}`
+
+    Specify an alternate swupd state directory. Normally `swupd` uses
+    `/var/lib/swupd`.
+
+
+## SUBCOMMANDS
+
+`bundle-add {bundles}`
+
+    Installs new software bundles. Bundles available can be listed with
+    the `--list` option. Any bundle name listed after `bundle-add` will
+    be downloaded and installed.
+
+    *  `-l, --list`
+
+        Lists all available software bundles, either installed or not, that
+        are available.
+
+`bundle-remove {bundles}`
+
+    Removes software bundles. Any bundle name listed after `bundle-remove`
+    will be removed from the system, as well as all bundles that required
+    the listed bundles, either directly or indirectly.
+
+`check-update`
+
+    Checks whether an update is available and prints out the information
+    if so. Does not download update content.
+
+`hashdump {path}`
+
+    Calculates and print the Manifest hash for a specific file on disk.
+
+    * `-n --no-xattrs`
+
+        Ignore extended attributes when calculating hash.
+
+    * `-p, --path={path}`
+
+        Specify the path to use for operations. This can be used to
+        point to a chroot installation of the OS or a custom mount.
+
+`search {string}`
+
+    Search for matching paths in manifest data. The specified {string}
+    is matched in any part of the path listed in manifests, and all
+    matches are printed, including the name of the bundle in which the
+    match was found.
+
+    If manifest data is not present in the state folder, it is
+    downloaded from the content url.
+
+    Because this search consults all manifests, it normally requires to
+    download all manifests for bundles that are not installed, and may
+    result in the download of several mega bytes of manifest data.
+
+    * `-l, --library`
+
+        Restrict search to designated dynamic shared library paths.
+
+    * `-b, --binary`
+
+        Restrict search to designated program binary paths.
+
+    * `-i, --init`
+
+        Perform collection and download of all required manifest
+        resources needed to perform the search, then exit.
+
+    * `-d, --display-files`
+
+        Do not search for any particular string, instead, print out all
+        files, paths, etc. listed in any manifest, and exit.
+
+    * `-s, --scope={b|o}`
+
+        Restrict search to only list the first match found in *b*undle
+        or *o*s.
+
+`update`
+
+    Performs a system software update.
+
+    The program will contact the version server at the version url, and
+    check to see if a system software update is available. If an update
+    is available, the update content will be downloaded from the content
+    url and stored in the `/var/lib/swupd` state path. Once all content
+    is downloaded and verified, the update is applied to the system.
+
+    In case any problem arises during a software update, the program
+    attempts to correct the issue, possibly by performing a `swupd verify --fix`
+    operation, which corrects broken or missing files and other issues.
+
+    After the update is applied, the system performs an array of
+    post-update actions. These actions are triggered through `systemd(1)`
+    and reside in the `update-triggers.target(4)` system target.
+
+    * `-s, --status`
+
+        Do not perform an update, instead display whether an update is
+        available on the version url server, and what version number is
+        available.
+
+    * `-d, --download`
+
+        Do not perform an update, instead download all resources needed
+        to perform the update, and exit.
+
+`verify`
+
+    Perform system software installation verification. The program will
+    obtain all the manifests needed from version url and content url to
+    establish whether the system software is correctly installed and not
+    overwritten, modified, missing or otherwise incorrect (permissions, etc.).
+
+    After obtaining the proper resources, all files that are under
+    control of the software update program are verified according to the
+    manifest data
+
+    * `-f, --fix`
+
+        Correct any issues found. This will overwrite incorrect file
+        content, add missing files and do additional corrections, permissions
+        etc.
+
+    * `-i, --install`
+
+        Install all files into {path} as specified by the `--path={path}`
+        option. Useful to generate a new system root, or verify side
+        by side.
+
+    * `-q, --quick`
+
+        Omit checking hash values. Instead only corrects missing files
+        and directories and/or symlinks.
+
+
+## EXIT STATUS
+
+On success, 0 is returned. A non-zero return code signals a failure.
+
+If the subcommand `check-update` was specified, the program returns `0`
+if an update is available, `1` if no update available, and a return value
+higher than `1` signals a failure.
+
+
+## COPYRIGHT
+
+ * Copyright (C) 2016 Intel Corporation, License: CC-BY-SA-3.0
+
+
+## SEE ALSO
+
+`check-update.service(4)`, `check-update.timer(4)`,
+`swupd-update.service(4)`, `swupd-update.timer(4)`,
+`update-triggers.target(4)`
+
+https://github.com/clearlinux/swupd-client/
+
+https://clearlinux.org/documentation/
+
+
+## NOTES
+
+Creative Commons Attribution-ShareAlike 3.0 Unported
+
+ * http://creativecommons.org/licenses/by-sa/3.0/
diff --git a/docs/update-triggers.target.4.md b/docs/update-triggers.target.4.md
new file mode 100644
index 00000000..0bdf8732
--- /dev/null
+++ b/docs/update-triggers.target.4.md
@@ -0,0 +1,48 @@
+update-triggers.target(4) -- System Unit
+===================================
+
+## SYNOPSIS
+
+`update-triggers.target`
+`/usr/lib/systemd/system/update-triggers.target`
+
+## DESCRIPTION
+
+Instructs the `systemd(1)` system daemon what units needed to be started
+as part of the software update process. After the main software update
+content is applied to the OS, the `swupd(1)` program starts this
+*systemd* target.
+
+The main function of this target is to allow optional corrections
+and adjustments to be made after installation that can not easily be
+made through static file installation methods. This usually applies to
+things like cached lists, dynamic configuration files and similar
+volatile databases that are regularly altered and may contain user
+data.
+
+One example is the dynamic loader cache which needs to be updated when
+ever there are modifications to the system installed dynamic libraries.
+
+The user is not intended to execute these scripts and plugin units
+directly. If however so this is desired, one can execute the following
+command to re-execute all the actions:
+
+`systemctl start update-triggers.target`
+
+## ENVIRONMENT
+
+This unit is a `systemd(1)` target file.
+
+## COPYRIGHT
+
+ * Copyright (C) 2016 Intel Corporation, License: CC-BY-SA-3.0
+
+## SEE ALSO
+
+`swupd(1)`
+
+## NOTES
+
+Creative Commons Attribution-ShareAlike 3.0 Unported
+
+ * http://creativecommons.org/licenses/by-sa/3.0/