2 files changed, 40 insertions, 40 deletions

diff --git a/makefile b/makefile
index e34f5a9..63d9985 100644..100755
--- a/makefile
+++ b/makefile
@@ -10,7 +10,7 @@
 #   print                  print the build settings
 
 PLAT?= linux
-PLATS= macosx linux win32 mingw freebsd
+PLATS= macosx linux win32 win64 mingw freebsd solaris
 
 all: $(PLAT)
 
@@ -33,6 +33,9 @@ install-both:
         $(MAKE) clean
         @cd src; $(MAKE) $(PLAT) LUAV=5.3
         @cd src; $(MAKE) install LUAV=5.3
+        $(MAKE) clean
+        @cd src; $(MAKE) $(PLAT) LUAV=5.4
+        @cd src; $(MAKE) install LUAV=5.4
 
 install-both-unix:
         $(MAKE) clean
@@ -44,6 +47,9 @@ install-both-unix:
         $(MAKE) clean
         @cd src; $(MAKE) $(PLAT) LUAV=5.3
         @cd src; $(MAKE) install-unix LUAV=5.3
+        $(MAKE) clean
+        @cd src; $(MAKE) $(PLAT) LUAV=5.4
+        @cd src; $(MAKE) install-unix LUAV=5.4
 
 .PHONY: test
 
diff --git a/makefile.dist b/makefile.dist
index 45a8866..5ef44d3 100644
--- a/makefile.dist
+++ b/makefile.dist
@@ -1,7 +1,7 @@
 #--------------------------------------------------------------------------
 # Distribution makefile
 #--------------------------------------------------------------------------
-DIST = luasocket-3.0-rc1
+DIST = luasocket-3.0.0
 
 TEST = \
         test/README \
@@ -22,20 +22,17 @@ SAMPLES = \
         samples/lpr.lua \
         samples/talker.lua \
         samples/tinyirc.lua
-
-ETC = \
-        etc/README \
-        etc/b64.lua \
-        etc/check-links.lua \
-        etc/check-memory.lua \
-        etc/dict.lua \
-        etc/dispatch.lua \
-        etc/eol.lua \
-        etc/forward.lua \
-        etc/get.lua \
-        etc/lp.lua \
-        etc/qp.lua \
-        etc/tftp.lua
+        samples/b64.lua \
+        samples/check-links.lua \
+        samples/check-memory.lua \
+        samples/dict.lua \
+        samples/dispatch.lua \
+        samples/eol.lua \
+        samples/forward.lua \
+        samples/get.lua \
+        samples/lp.lua \
+        samples/qp.lua \
+        samples/tftp.lua
 
 SRC = \
         src/makefile \
@@ -92,39 +89,36 @@ 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)
-        cp -vf NEW $(DIST)
+        cp -vf CHANGELOG.md $(DIST)
         cp -vf LICENSE $(DIST)
-        cp -vf README $(DIST)
+        cp -vf README.md $(DIST)
         cp -vf $(MAKE) $(DIST)
 
-        mkdir -p $(DIST)/etc
-        cp -vf $(ETC) $(DIST)/etc
-
         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