diff --git a/biology/rasmol/Makefile b/biology/rasmol/Makefile
index 2aa54c3ffff5..93283da28967 100644
--- a/biology/rasmol/Makefile
+++ b/biology/rasmol/Makefile
@@ -6,32 +6,37 @@
 #
 
 PORTNAME=	rasmol
-PORTVERSION=	2.7.2
-PORTREVISION=	1
+PORTVERSION=	2.7.2.1.1
 CATEGORIES=	biology
-MASTER_SITES=	ftp://ftp.bernstein-plus-sons.com/software/RasMol_2.7.2/
-DISTNAME=	RasMol
+MASTER_SITES=	ftp://ftp.bernstein-plus-sons.com/software/
+DISTNAME=	RasMol_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast Molecular Visualization Program
 
-WRKSRC=		${WRKDIR}/RasMol_2.7.2/src
+WRKSRC=		${WRKDIR}/RasMol_${PORTVERSION}/src
 
 USE_X_PREFIX=	yes
-
-.include <bsd.port.pre.mk>
-
 USE_IMAKE=	yes
+MANCOMPRESSED=	no
+XFREE86_HTML_MAN=	no
 
 MAN1=		rasmol.1
 
+PLIST_FILES=	bin/rasmol bin/rasmol-16 bin/rasmol-32 bin/rasmol-8 \
+		lib/X11/rasmol/1crn.pdb lib/X11/rasmol/3cro.pdb \
+		lib/X11/rasmol/rasmol.hlp
+PLIST_DIRS=	lib/X11/rasmol
+
+.include <bsd.port.pre.mk>
+
 do-build:
 	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/build_viewer
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rasmol-* ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${FILESDIR}/rasmol ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/rasmol.man ${PREFIX}/man/man1/rasmol.1
+	${INSTALL_MAN} ${WRKSRC}/rasmol.man ${MANPREFIX}/man/man1/rasmol.1
 	${MKDIR} ${PREFIX}/lib/X11/rasmol
 	${INSTALL_DATA} ${WRKSRC}/rasmol.hlp ${PREFIX}/lib/X11/rasmol
 	${INSTALL_DATA} ${WRKSRC}/../data/1crn.pdb ${PREFIX}/lib/X11/rasmol
diff --git a/biology/rasmol/distinfo b/biology/rasmol/distinfo
index 8f1ad94531e2..b23931a5923a 100644
--- a/biology/rasmol/distinfo
+++ b/biology/rasmol/distinfo
@@ -1,2 +1,2 @@
-MD5 (RasMol.tar.gz) = 03550d60f85725b032c4eab1a9311d37
-SIZE (RasMol.tar.gz) = 3671619
+MD5 (RasMol_2.7.2.1.1.tar.gz) = c75f1a30030b9a0ed0b55a076b1f235c
+SIZE (RasMol_2.7.2.1.1.tar.gz) = 4845420
diff --git a/biology/rasmol/files/patch-aa b/biology/rasmol/files/patch-aa
index d924c37dc253..e6a7405c750f 100644
--- a/biology/rasmol/files/patch-aa
+++ b/biology/rasmol/files/patch-aa
@@ -1,24 +1,20 @@
---- Imakefile.orig	Tue Jul  6 07:48:28 1999
-+++ Imakefile	Mon Aug 23 11:36:22 1999
-@@ -64,7 +64,7 @@
+--- Imakefile.orig	Sun Dec 14 05:04:11 2003
++++ Imakefile	Tue Jul  6 00:39:39 2004
+@@ -103,7 +103,7 @@
  
  # RasMol's on-line help direcory
  #   e.g. /usr/local/lib/rasmol/rasmol.hlp
 -RASMOLDIR = $(USRLIBDIR)/rasmol/
-+RASMOLDIR = $(PREFIX)/lib/X11/rasmol/
++RASMOLDIR = $(LIBDIR)/rasmol/
  
  
  
-@@ -104,8 +104,8 @@
- ComplexProgramTarget(rasmol)
- MakeDirectories(install,$(RASMOLDIR))
- InstallNonExec(rasmol.hlp,$(RASMOLDIR))
--InstallNonExec(data/1crn.pdb,$(RASMOLDIR))
--InstallNonExec(data/3cro.pdb,$(RASMOLDIR))
-+InstallNonExec(../data/1crn.pdb,$(RASMOLDIR))
-+InstallNonExec(../data/3cro.pdb,$(RASMOLDIR))
+@@ -168,7 +168,7 @@
+ InstallNonExec(../data/3cro.pdb,$(RASMOLDIR))
  
--rasmol.man::	doc/rasmol.1
--		ln -s doc/rasmol.1 rasmol.man
-+rasmol.man::
-+		gunzip -c ../doc/rasmol.1.gz > rasmol.man 
+ rasmol.man::	../doc/rasmol.1
+-		ln -s ../doc/rasmol.1 rasmol.man
++		gunzip  <../doc/rasmol.1.gz > rasmol.man
+ 
+ ../doc/rasmol.1:	../doc/rasmol.1.gz
+ 		gunzip  <../doc/rasmol.1.gz > ../doc/rasmol.1
diff --git a/biology/rasmol/pkg-descr b/biology/rasmol/pkg-descr
index f896453cdd50..d7524dbdecde 100644
--- a/biology/rasmol/pkg-descr
+++ b/biology/rasmol/pkg-descr
@@ -1,8 +1,8 @@
-    RasMol is a molecular graphics program intended for the visualisation 
-of proteins, nucleic acids and small molecules. The program is aimed at 
-display, teaching and generation of publication quality images. The program 
-has been developed at the University of Edinburgh's Biocomputing Research 
-Unit and the Biomolecular Structures Group at Glaxo Research and Development, 
-Greenford, UK. 
+RasMol is a molecular graphics program intended for the visualisation
+of proteins, nucleic acids and small molecules. The program is aimed at
+display, teaching and generation of publication quality images. The
+program has been developed at the University of Edinburgh's Biocomputing
+Research Unit and the Biomolecular Structures Group at Glaxo Research
+and Development, Greenford, UK.
 
-WWW: http://www.umass.edu/microbio/rasmol/index2.htm
+WWW: http://www.rasmol.org/
diff --git a/biology/rasmol/pkg-plist b/biology/rasmol/pkg-plist
deleted file mode 100644
index 61dbd0b40e42..000000000000
--- a/biology/rasmol/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/rasmol
-bin/rasmol-16
-bin/rasmol-32
-bin/rasmol-8
-lib/X11/rasmol/1crn.pdb
-lib/X11/rasmol/3cro.pdb
-lib/X11/rasmol/rasmol.hlp
-@dirrm lib/X11/rasmol