diff --git a/doc/dns.html b/docs/dns.html
similarity index 100%
rename from doc/dns.html
rename to docs/dns.html
diff --git a/doc/ftp.html b/docs/ftp.html
similarity index 100%
rename from doc/ftp.html
rename to docs/ftp.html
diff --git a/doc/http.html b/docs/http.html
similarity index 100%
rename from doc/http.html
rename to docs/http.html
diff --git a/doc/index.html b/docs/index.html
similarity index 100%
rename from doc/index.html
rename to docs/index.html
diff --git a/doc/installation.html b/docs/installation.html
similarity index 100%
rename from doc/installation.html
rename to docs/installation.html
diff --git a/doc/introduction.html b/docs/introduction.html
similarity index 100%
rename from doc/introduction.html
rename to docs/introduction.html
diff --git a/doc/ltn12.html b/docs/ltn12.html
similarity index 100%
rename from doc/ltn12.html
rename to docs/ltn12.html
diff --git a/doc/lua05.ppt b/docs/lua05.ppt
similarity index 100%
rename from doc/lua05.ppt
rename to docs/lua05.ppt
diff --git a/doc/luasocket.png b/docs/luasocket.png
similarity index 100%
rename from doc/luasocket.png
rename to docs/luasocket.png
diff --git a/doc/mime.html b/docs/mime.html
similarity index 100%
rename from doc/mime.html
rename to docs/mime.html
diff --git a/doc/reference.css b/docs/reference.css
similarity index 100%
rename from doc/reference.css
rename to docs/reference.css
diff --git a/doc/reference.html b/docs/reference.html
similarity index 100%
rename from doc/reference.html
rename to docs/reference.html
diff --git a/doc/smtp.html b/docs/smtp.html
similarity index 100%
rename from doc/smtp.html
rename to docs/smtp.html
diff --git a/doc/socket.html b/docs/socket.html
similarity index 100%
rename from doc/socket.html
rename to docs/socket.html
diff --git a/doc/tcp.html b/docs/tcp.html
similarity index 100%
rename from doc/tcp.html
rename to docs/tcp.html
diff --git a/doc/udp.html b/docs/udp.html
similarity index 100%
rename from doc/udp.html
rename to docs/udp.html
diff --git a/doc/url.html b/docs/url.html
similarity index 100%
rename from doc/url.html
rename to docs/url.html
diff --git a/luasocket-scm-3.rockspec b/luasocket-scm-3.rockspec
index 4e1669c..0e1b0f9 100644
--- a/luasocket-scm-3.rockspec
+++ b/luasocket-scm-3.rockspec
@@ -127,7 +127,7 @@ build = {
     mingw32 = make_plat("mingw32")
   },
   copy_directories = {
-    "doc"
+    "docs"
     , "samples"
     , "etc"
     , "test" }
diff --git a/makefile.dist b/makefile.dist
index 45a8866..83c303e 100644
--- a/makefile.dist
+++ b/makefile.dist
@@ -92,23 +92,23 @@ MAKE = \
 	socket.vcxproj \
 	mime.vcxproj
 
-DOC = \
-	doc/dns.html \
-	doc/ftp.html \
-	doc/index.html \
-	doc/http.html \
-	doc/installation.html \
-	doc/introduction.html \
-	doc/ltn12.html \
-	doc/luasocket.png \
-	doc/mime.html \
-	doc/reference.css \
-	doc/reference.html \
-	doc/smtp.html \
-	doc/socket.html \
-	doc/tcp.html \
-	doc/udp.html \
-	doc/url.html
+DOCS = \
+	docs/dns.html \
+	docs/ftp.html \
+	docs/index.html \
+	docs/http.html \
+	docs/installation.html \
+	docs/introduction.html \
+	docs/ltn12.html \
+	docs/luasocket.png \
+	docs/mime.html \
+	docs/reference.css \
+	docs/reference.html \
+	docs/smtp.html \
+	docs/socket.html \
+	docs/tcp.html \
+	docs/udp.html \
+	docs/url.html
 
 dist:
 	mkdir -p $(DIST)
@@ -123,8 +123,8 @@ dist:
 	mkdir -p $(DIST)/src
 	cp -vf $(SRC) $(DIST)/src
 
-	mkdir -p $(DIST)/doc
-	cp -vf $(DOC) $(DIST)/doc
+	mkdir -p $(DIST)/docs
+	cp -vf $(DOCS) $(DIST)/docs
 
 	mkdir -p $(DIST)/samples
 	cp -vf $(SAMPLES) $(DIST)/samples