diff --git a/cirros/content.md b/cirros/content.md
index cd531ec0b..607b76993 100644
--- a/cirros/content.md
+++ b/cirros/content.md
@@ -1,7 +1,12 @@
 # What is CirrOS?
 
-CirrOS is a Tiny OS that specializes in running on a cloud.
+The CirrOS project provides linux disk and kernel/initramfs images. The images are well suited for testing as they are small and boot quickly. Please note that:
 
-> [launchpad.net/cirros](https://launchpad.net/cirros)
+-	**Images are provided for test only**. They should not be used in production.
+-	**Images have well known login information**. Users can log in with 'cirros:letsgocubs' locally or remotely and have passwordless sudo access to root.
+
+CirrOS images have useful tools and function for debugging or developing cloud infrastructure.
+
+> [github.com/cirros-dev/cirros](https://github.com/cirros-dev/cirros#readme)
 
 %%LOGO%%