diff --git a/x11/xkeywrap/Makefile b/x11/xkeywrap/Makefile
index 592dd581a118..dc18208e889e 100644
--- a/x11/xkeywrap/Makefile
+++ b/x11/xkeywrap/Makefile
@@ -6,19 +6,22 @@
 #
 
 PORTNAME=	xkeywrap
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	x11
-MASTER_SITES=	http://www.seki.ee.kagu.sut.ac.jp/~sakai/
+MASTER_SITES=	http://www.seki.ee.kagu.sut.ac.jp/~sakai/myfreesoft/ \
+		http://hp.vector.co.jp/authors/VA014157/myfreesoft/ \
+		http://www.people.or.jp/~hsakai/myfreesoft/
 
 MAINTAINER=	sakai@seki.ee.kagu.sut.ac.jp
 
 USE_X_PREFIX=	yes
 MAN1=		xkeywrap.1
+MANCOMPRESSED=	yes
 PORTSDOCDIR=	${PREFIX}/share/doc/xkeywrap
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xkeywrap ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xkeywrap.man ${PREFIX}/man/man1/xkeywrap.1
+	${INSTALL_MAN} ${WRKSRC}/xkeywrap.1.gz ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PORTSDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${PORTSDOCDIR}
diff --git a/x11/xkeywrap/distinfo b/x11/xkeywrap/distinfo
index 6c5535261141..362464760b09 100644
--- a/x11/xkeywrap/distinfo
+++ b/x11/xkeywrap/distinfo
@@ -1 +1 @@
-MD5 (xkeywrap-1.0.tar.gz) = 14166cfa1a18e07bfc6939472d1fc2f3
+MD5 (xkeywrap-1.1.tar.gz) = 992c36b39262361a175b32c9263add9f
diff --git a/x11/xkeywrap/files/patch-aa b/x11/xkeywrap/files/patch-aa
index 6313d2e6df3d..4f6e9f18c458 100644
--- a/x11/xkeywrap/files/patch-aa
+++ b/x11/xkeywrap/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Sat Jan  1 17:01:01 2000
-+++ Makefile	Sat Feb 19 00:58:13 2000
-@@ -6,22 +6,24 @@
+--- Makefile.orig	Sun Apr 22 16:52:58 2001
++++ Makefile	Sun Apr 22 16:55:06 2001
+@@ -6,16 +6,16 @@
  ###############################################################################
  
  #PREFIX  = /usr/local
@@ -10,31 +10,24 @@
 +#X11BASE = /usr/X11R6
  BINDIR  = ${PREFIX}/bin
  MANDIR  = ${PREFIX}/man/man1
- PKGNAME = xkeywrap-1.0
- VERSION = XKeyWrap-1.0
-+CC	?= gcc
-+CFLAGS	?= -O2
+ PKGNAME = xkeywrap-1.1
+ VERSION = XKeyWrap-1.1
+ 
+-CC = cc
+-CFLAGS = -O -Wall
+-LFLAGS =
++#CC = cc
++#CFLAGS = -O -Wall
++#LFLAGS =
  
  all :		xkeywrap xkeywrap.1.gz
  
- xkeywrap :	xkeywrap.c list.o readme.h copyright.h
--		gcc xkeywrap.c list.o -o xkeywrap \
-+		${CC} ${CFLAGS} xkeywrap.c list.o -o xkeywrap \
- 			-I${X11BASE}/include -L${X11BASE}/lib -lX11 -lXt \
- 			-DVERSION=\"${VERSION}\"
- 
- list.o :	list.c list.h
--		gcc -c list.c -I/usr/X11R6/include
-+		${CC} ${CFLAGS} -c list.c -I${X11BASE}/include
- 
- readme.h :	README mkstr
- 		cat README | ./mkstr readme > readme.h
-@@ -30,7 +32,7 @@
+@@ -40,7 +40,7 @@
  		cat COPYRIGHT | ./mkstr copyright > copyright.h
  
  mkstr :		mkstr.c
--		gcc mkstr.c -o mkstr
-+		${CC} ${CFLAGS} mkstr.c -o mkstr
+-		$(CC) mkstr.c -o mkstr
++		$(CC) $(CFLAGS) mkstr.c -o mkstr
  
  xkeywrap.1.gz :	xkeywrap.man
  		cp xkeywrap.man xkeywrap.1
diff --git a/x11/xkeywrap/pkg-descr b/x11/xkeywrap/pkg-descr
index 5f5f5efe3aa3..2ddff9c356eb 100644
--- a/x11/xkeywrap/pkg-descr
+++ b/x11/xkeywrap/pkg-descr
@@ -1,8 +1,7 @@
 XKeyWrap is a wrapper of key sequence between keyboard and an application
 (ex.emacs).
-XKeyWrap can record, repeat, and play key sequence in real time.
-And XKeyWrap can send key sequence to an application on other X server
-over the network.
+XKeyWrap can record and play key sequence in real time. And XKeyWrap can send
+key sequence to an application on other X server over the network.
 
 If you want to read more details, type
     % xkeywrap -readme
@@ -17,11 +16,7 @@ If you want to see a demonstration of XKeyWrap, type
 If you want to get the full or newest original destribution package
 of XKeyWrap, see
 
-WWW: http://www.seki.ee.kagu.sut.ac.jp/~sakai/myfreesoft.html
-
-This software is distributed under the GNU General Public License.
-If you want to get a copy of the GNU General Public License, see above
-web site and get the full original destribution package of XKeyWrap.
+WWW: http://www.seki.ee.kagu.sut.ac.jp/~sakai/myfreesoft/index.html
 
 - Sakai Hiroaki
 sakai@seki.ee.kagu.sut.ac.jp