diff --git a/Makefile b/Makefile
index 91b36eb6..6642e25f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # See LICENSE for licensing information.
 
 PROJECT = cowboy
-PROJECT_DESCRIPTION = Small, fast, modular HTTP server.
+PROJECT_DESCRIPTION = Small, fast, modern HTTP server.
 PROJECT_VERSION = 2.0.0-pre.4
 PROJECT_REGISTERED = cowboy_clock
 
diff --git a/README.md b/README.md
index bb2ea249..242defcf 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Cowboy
 ======
 
-Cowboy is a small, fast and modular HTTP server written in Erlang.
+Cowboy is a small, fast and modern HTTP server for Erlang/OTP.
 
 Goals
 -----
diff --git a/doc/src/guide/introduction.asciidoc b/doc/src/guide/introduction.asciidoc
index d262b5ce..c9d042d3 100644
--- a/doc/src/guide/introduction.asciidoc
+++ b/doc/src/guide/introduction.asciidoc
@@ -1,7 +1,7 @@
 [[introduction]]
 == Introduction
 
-Cowboy is a small, fast and modular HTTP server written in Erlang.
+Cowboy is a small, fast and modern HTTP server for Erlang/OTP.
 
 Cowboy aims to provide a complete xref:modern_web[modern Web stack].
 This includes HTTP/1.1, HTTP/2, Websocket, Server-Sent Events and
diff --git a/doc/src/manual/cowboy_app.asciidoc b/doc/src/manual/cowboy_app.asciidoc
index 945a56b5..7e80efba 100644
--- a/doc/src/manual/cowboy_app.asciidoc
+++ b/doc/src/manual/cowboy_app.asciidoc
@@ -2,7 +2,7 @@
 
 == Name
 
-cowboy - HTTP server for Erlang/OTP
+cowboy - Small, fast, modern HTTP server for Erlang/OTP
 
 == Description
 
diff --git a/ebin/cowboy.app b/ebin/cowboy.app
index f8608c31..f44c8fc1 100644
--- a/ebin/cowboy.app
+++ b/ebin/cowboy.app
@@ -1,5 +1,5 @@
 {application, cowboy, [
-	{description, "Small, fast, modular HTTP server."},
+	{description, "Small, fast, modern HTTP server."},
 	{vsn, "2.0.0-pre.2"},
 	{modules, ['cowboy','cowboy_app','cowboy_bstr','cowboy_clear','cowboy_clock','cowboy_constraints','cowboy_handler','cowboy_http','cowboy_http2','cowboy_loop','cowboy_middleware','cowboy_req','cowboy_rest','cowboy_router','cowboy_static','cowboy_stream','cowboy_stream_h','cowboy_sub_protocol','cowboy_sup','cowboy_tls','cowboy_websocket']},
 	{registered, [cowboy_sup,cowboy_clock]},