diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile
index fbd56340ca96..35f5833246ed 100644
--- a/www/wordpress/Makefile
+++ b/www/wordpress/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	wordpress
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.1
 PORTEPOCH=	1
 CATEGORIES=	www
-MASTER_SITES=	http://wordpress.org/beta/ \
-		ftp://ftp.stu.edu.tw/pub/wordpress/ \
+MASTER_SITES=	ftp://ftp.stu.edu.tw/pub/wordpress/ \
 		ftp://ftp.twaren.net/local-distfiles/wordpress/
 MASTER_SITE_SUBDIR=	cafelog
 
diff --git a/www/wordpress/distinfo b/www/wordpress/distinfo
index 916b470eace3..2a98cf6b0eeb 100644
--- a/www/wordpress/distinfo
+++ b/www/wordpress/distinfo
@@ -1,3 +1,3 @@
-MD5 (wordpress-2.1.0.tar.gz) = a8ffd0063b080de4789b928696c1fb26
-SHA256 (wordpress-2.1.0.tar.gz) = f4dad1e09c7a9f29e3e13d008fd55562a9a6d928065c81b7e816a6b8bac2fcac
-SIZE (wordpress-2.1.0.tar.gz) = 694611
+MD5 (wordpress-2.1.1.tar.gz) = d32a275dc4014e763780f0fb7e765bf5
+SHA256 (wordpress-2.1.1.tar.gz) = b0198008a217aad9cf568668ad984f526d416f7120ec0a8067dfb5e611c6f0aa
+SIZE (wordpress-2.1.1.tar.gz) = 694873
diff --git a/www/wordpress/pkg-message b/www/wordpress/pkg-message
index bd1695a65d11..2bb0a0f75f33 100644
--- a/www/wordpress/pkg-message
+++ b/www/wordpress/pkg-message
@@ -1,10 +1,7 @@
-
                   **** NOTE ****
         Before the first use of WordPress, copy wp-config-sample.php to wp-config.php
         in ${PREFIX}/${WORDPRESS}
         And Modify it to fit your MySQL.
         Maybe you need 'mysqladmin create wordpress' first
-
         If you are upgrading from 1.x or 2.0 to 2.1, please run
         http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 2.1
-