diff --git a/textproc/ruby-htmltools/Makefile b/textproc/ruby-htmltools/Makefile
index cf23104d1733..2aa776c8837f 100644
--- a/textproc/ruby-htmltools/Makefile
+++ b/textproc/ruby-htmltools/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.09
 CATEGORIES=	textproc ruby
 MASTER_SITES=	http://rubyforge.org/frs/download.php/1340/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	ruby-${PORTNAME}
+DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	alecn2002@yandex.ru
@@ -22,6 +22,7 @@ RUBY_SETUP=	install.rb
 CONFIGURE_ARGS=		--prefix=${PREFIX}
 RUBY_INSTALL_ARGS=	--prefix=${PREFIX}
 NOHARM_ARGS=	--no-harm
+WRKSRC=		${WRKDIR}/ruby-${PORTNAME}
 
 install-noharm:
 	@${ECHO_MSG} "===>  Running ${RUBY_SETUP} to NOHARM-install (Just output, do nothing)"
diff --git a/textproc/ruby-htmltools/distinfo b/textproc/ruby-htmltools/distinfo
index a6bdc1b6e781..0bc37de01816 100644
--- a/textproc/ruby-htmltools/distinfo
+++ b/textproc/ruby-htmltools/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/ruby-htmltools.tar.gz) = 62b55355964699f44e40d77e14e3eb70
-SIZE (ruby/ruby-htmltools.tar.gz) = 26930
+MD5 (ruby/ruby-htmltools-1.09.tar.gz) = 62b55355964699f44e40d77e14e3eb70
+SIZE (ruby/ruby-htmltools-1.09.tar.gz) = 26930