diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0398a9fa..f6753b6ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,7 @@ cmake_dependent_option(WITH_PHYSICS "Build Physics library" OFF "NOT WITH_EVERYT
 cmake_dependent_option(WITH_PRIMITIVES "Builf Primitives library" OFF "NOT WITH_EVERYTHING;NOT WITH_DEBUGTOOLS" ON)
 cmake_dependent_option(WITH_SCENEGRAPH "Build SceneGraph library" OFF "NOT WITH_EVERYTHING;NOT WITH_DEBUGTOOLS" ON)
 cmake_dependent_option(WITH_SHADERS "Build Shaders library" OFF "NOT WITH_EVERYTHING;NOT WITH_DEBUGTOOLS" ON)
+cmake_dependent_option(WITH_TEXT "Build Text library" OFF "NOT WITH_EVERYTHING" ON)
 cmake_dependent_option(WITH_TEXTURETOOLS "Build TextureTools library" OFF "NOT WITH_EVERYTHING" ON)
 
 cmake_dependent_option(WITH_MAGNUMINFO "Build magnum-info utility" OFF "NOT WITH_EVERYTHING" ON)
diff --git a/doc/namespaces.dox b/doc/namespaces.dox
index 90d800d8b..654ff8540 100644
--- a/doc/namespaces.dox
+++ b/doc/namespaces.dox
@@ -104,6 +104,15 @@ Collision detection system and rigid body objects. See @ref collision-detection
 for introduction.
 */
 
+/** @dir Text
+ * @brief Namespace Magnum::Text
+ */
+/** @namespace Magnum::Text
+@brief %Text rendering
+
+Font texture creation and text layouting.
+*/
+
 /** @dir TextureTools
  * @brief Namespace Magnum::TextureTools
  */
diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake
index ee5437f6e..9f2e0e138 100644
--- a/modules/FindMagnum.cmake
+++ b/modules/FindMagnum.cmake
@@ -22,6 +22,7 @@
 #  Primitives    - Library with stock geometric primitives (static)
 #  SceneGraph    - Scene graph library
 #  Shaders       - Library with stock shaders
+#  Text          - Text rendering library
 #  TextureTools  - TextureTools library
 #  GlxApplication - GLX application (depends on X11 libraries)
 #  XEglApplication - X/EGL application (depends on EGL and X11 libraries)
@@ -198,6 +199,11 @@ foreach(component ${Magnum_FIND_COMPONENTS})
         set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_NAMES PhongShader.h)
     endif()
 
+    # Text library
+    if(${component} STREQUAL Text)
+        set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_NAMES Font.h)
+    endif()
+
     # TextureTools library
     if(${component} STREQUAL TextureTools)
         set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_NAMES Atlas.h)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 18619eac3..8ae6ea8fa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -162,6 +162,10 @@ if(WITH_SHADERS)
     add_subdirectory(Shaders)
 endif()
 
+if(WITH_TEXT)
+    add_subdirectory(Text)
+endif()
+
 if(WITH_TEXTURETOOLS)
     add_subdirectory(TextureTools)
 endif()
diff --git a/src/Text/CMakeLists.txt b/src/Text/CMakeLists.txt
new file mode 100644
index 000000000..e69de29bb