diff --git a/.template-helpers/compose.md b/.template-helpers/compose.md
new file mode 100644
index 000000000..901a1af15
--- /dev/null
+++ b/.template-helpers/compose.md
@@ -0,0 +1,5 @@
+... via [`docker-compose`](https://github.com/docker/compose)
+
+Example `docker-compose.yml` for `%%REPO%%`:
+
+%%COMPOSE-YML%%
diff --git a/update.sh b/update.sh
index d6bc294c0..29a503d41 100755
--- a/update.sh
+++ b/update.sh
@@ -93,6 +93,13 @@ for repo in "${repos[@]}"; do
 			logo="![logo](https://raw.githubusercontent.com/docker-library/docs/master/$repo/logo.png)"
 		fi
 		
+		compose=
+		composeYml=
+		if [ -f "$repo/docker-compose.yml" ]; then
+			compose="$(cat "$repo/compose.md" 2>/dev/null || cat "$helperDir/compose.md")"
+			composeYml="$(sed 's/^/\t/' "$repo/docker-compose.yml")"
+		fi
+		
 		cp -v "$helperDir/template.md" "$repo/README.md"
 		
 		echo '  TAGS => generate-dockerfile-links-partial.sh'
@@ -105,6 +112,12 @@ for repo in "${repos[@]}"; do
 		echo "  LOGO => $logo"
 		replace_field "$repo" 'LOGO' "$logo" '\s*'
 		
+		echo '  COMPOSE => '"$repo"'/compose.md'
+		replace_field "$repo" 'COMPOSE' "$compose"
+		
+		echo '  COMPOSE-YML => '"$repo"'/docker-compose.yml'
+		replace_field "$repo" 'COMPOSE-YML' "$composeYml"
+		
 		echo '  DOCKER-VERSIONS => '"$repo"'/docker-versions.md'
 		replace_field "$repo" 'DOCKER-VERSIONS' "$dockerVersions"
 		
diff --git a/wordpress/README.md b/wordpress/README.md
index 8deb3222e..9e3f021f1 100644
--- a/wordpress/README.md
+++ b/wordpress/README.md
@@ -38,6 +38,24 @@ If you'd like to use an external database instead of a linked `mysql` container,
 	docker run --name some-wordpress -e WORDPRESS_DB_HOST=10.1.2.3:3306 \
 	    -e WORDPRESS_DB_USER=... -e WORDPRESS_DB_PASSWORD=... -d wordpress
 
+## ... via [`docker-compose`](https://github.com/docker/compose)
+
+Example `docker-compose.yml` for `wordpress`:
+
+	wordpress:
+	  image: wordpress
+	  links:
+	    - db:mysql
+	  ports:
+	    - 8080:80
+	
+	db:
+	  image: mariadb
+	  environment:
+	    MYSQL_ROOT_PASSWORD: example
+
+Run `docker-compose up`, wait for it to initialize completely, and visit `http://localhost:8080` or `http://host-ip:8080`.
+
 # Supported Docker versions
 
 This image is officially supported on Docker version 1.5.0.
diff --git a/wordpress/content.md b/wordpress/content.md
index 1e00c03aa..feefc10bd 100644
--- a/wordpress/content.md
+++ b/wordpress/content.md
@@ -30,3 +30,7 @@ If you'd like to use an external database instead of a linked `mysql` container,
 
 	docker run --name some-wordpress -e WORDPRESS_DB_HOST=10.1.2.3:3306 \
 	    -e WORDPRESS_DB_USER=... -e WORDPRESS_DB_PASSWORD=... -d wordpress
+
+## %%COMPOSE%%
+
+Run `docker-compose up`, wait for it to initialize completely, and visit `http://localhost:8080` or `http://host-ip:8080`.
diff --git a/wordpress/docker-compose.yml b/wordpress/docker-compose.yml
new file mode 100644
index 000000000..f864c74b1
--- /dev/null
+++ b/wordpress/docker-compose.yml
@@ -0,0 +1,11 @@
+wordpress:
+  image: wordpress
+  links:
+    - db:mysql
+  ports:
+    - 8080:80
+
+db:
+  image: mariadb
+  environment:
+    MYSQL_ROOT_PASSWORD: example