diff --git a/CHANGELOG.md b/CHANGELOG.md
index b09cdc01a166cb3d82f381bda14c2d83f93ade36..b90590a58a3d67aa6a7ad000e9bffb54be80f206 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,5 @@
 # 0.2.1
 
-* instructions for how to run an IndieHosters server on Ubuntu 14.10 (as an alternative to CoreOS)
 * draft instructions for how to add an application (whether server-wide or per-user)
 * several bugfixes
 
diff --git a/doc/deploying-a-server.md b/doc/deploying-a-server.md
index 4e062c29e1e9a64ea3159cbe01668e653ad9572c..57b119f5e591888a44d93846a625fb72aefedf6c 100644
--- a/doc/deploying-a-server.md
+++ b/doc/deploying-a-server.md
@@ -4,8 +4,8 @@
 Make sure you read [getting started](getting-started-as-a-hoster.md) first.
 
 ### Prepare your orchestration data
-* Get a CoreOS or Ubuntu server, for instance from [RackSpace](rackspace.com) or [Vultr](vultr.com).
-* If you chose Ubuntu, follow the [Ubuntu-specific](running-on-ubuntu.md) instructions, then continue here.
+* Get a CoreOS server, for instance from [RackSpace](rackspace.com) or [Vultr](vultr.com).
+* We aim to also support Ubuntu 14.10, but this is currently blocked by issue [#44](https://github.com/indiehosters/indiehosters/issues/44)
 * If you didn't add your public ssh key during the order process (e.g. through your IaaS control panel or a cloud-config file),
   scp your laptop's public ssh key (probably in `~/.ssh/id_rsa.pub`) to `.ssh/authorized_keys` for the remote user
   you will be ssh-ing and scp-ing as (the default remote user of our deploy scripts is 'core').
diff --git a/doc/running-on-ubuntu.md b/doc/running-on-ubuntu.md
index baf6b59ea773923aa4708f270a3d286259779631..8a7b8537942947d002eeb75843332e9edf3c8daa 100644
--- a/doc/running-on-ubuntu.md
+++ b/doc/running-on-ubuntu.md
@@ -1,3 +1,14 @@
+# Work in progress
+
+
+
+
+We try to support ubuntu 14.10, but this is blocked by [#44](https://github.com/indiehosters/indiehosters/issues/44)
+
+
+
+
+
 To run an IndieHosters on ubuntu 14.10 (earlier versions will not work), run something like:
 
 ````bash