diff --git a/x11/yeahconsole/Makefile b/x11/yeahconsole/Makefile
index 8d3d541bea08..6460623e3015 100644
--- a/x11/yeahconsole/Makefile
+++ b/x11/yeahconsole/Makefile
@@ -1,17 +1,27 @@
-# Created by: asami
+# Created by: Satoshi Asami <asami@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	yeahconsole
 PORTVERSION=	0.3.4
 CATEGORIES=	x11
 MASTER_SITES=	http://phrat.de/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	quake console-like extension for X terminals
+COMMENT=	Terminal wrapper for creating drop-down consoles
+
+LICENSE=	GPLv2
 
 USE_XORG=	x11
+ALL_TARGET=	${PORTNAME}
 
 PLIST_FILES=	bin/yeahconsole
+PORTDOCS=	README
+
+OPTIONS_DEFINE=	DOCS
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/yeahconsole/files/patch-Makefile b/x11/yeahconsole/files/patch-Makefile
index 6df806381d5a..526cb8be044b 100644
--- a/x11/yeahconsole/files/patch-Makefile
+++ b/x11/yeahconsole/files/patch-Makefile
@@ -1,37 +1,33 @@
 --- Makefile.orig	2006-01-14 18:54:05.000000000 +0300
 +++ Makefile	2008-04-30 12:23:01.000000000 +0400
-@@ -5,26 +5,26 @@
+@@ -1,24 +1,23 @@
+ TARGET = yeahconsole
+-CC = gcc
++CC ?= gcc
+ #CC = cc
+ INSTALL = install
  
  PREFIX = /usr/local
  
--LIBS = -lX11 
+ LIBS = -lX11 
 -INCLUDES = -I/usr/X11R6/include 
 -LIB_DIRS = -L/usr/X11R6/lib
 -FLAGS = -Os -Wall
-+LIBS = -lX11
-+INCLUDES = -I/usr/local/include 
-+LIB_DIRS = -L/usr/local/lib
-+CFLAGS? = -Os -Wall
++INCLUDES = -I$(LOCALBASE)/include
++LIB_DIRS = -L$(LOCALBASE)/lib
++CFLAGS ?= -Os -Wall
  
  OBJECTS := yeahconsole.o
  SOURCES := yeahconsole.c
  
  $(TARGET): $(OBJECTS) 
 -	$(CC) $(DEFINES) $(INCLUDES) $(LIB_DIRS) $(LIBS) -o $@ $<
-+	$(CC) $(DEFINES) $(INCLUDES) $(LIB_DIRS) $(LIBS) -o $@ $(SOURCES)
- 	strip $@
+-	strip $@
++	$(CC) $(DEFINES) $(INCLUDES) $(LIB_DIRS) $(LIBS) -o $@ $>
  
  $(OBJECTS): $(SOURCES) 
 -	$(CC) $(FLAGS)  $(DEFINES) $(INCLUDES) $(LIB_DIRS) -c -o $@ $<
--
-+	$(CC) $(CFLAGS)  $(DEFINES) $(INCLUDES) $(LIB_DIRS) -c -o $@ $(SOURCES)
-+all:	$(TARGET)
++	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) $(LIB_DIRS) -c -o $@ $<
+ 
  clean:
  	rm -rf $(TARGET) $(OBJECTS)
- 
- install: $(TARGET) $(MAN)
--	$(INSTALL) -o root -g root -m 0755 $(TARGET) $(PREFIX)/bin
-+	$(INSTALL) -o root -g wheel -m 0755 $(TARGET) $(PREFIX)/bin
- 	
- 
- uninstall:
diff --git a/x11/yeahconsole/pkg-descr b/x11/yeahconsole/pkg-descr
index 5bbd42af3dfd..4684b0e56ed5 100644
--- a/x11/yeahconsole/pkg-descr
+++ b/x11/yeahconsole/pkg-descr
@@ -1,5 +1,6 @@
-YeahConsole turns an xterm into a gamelike console.
-This means it will slide down from top of your screen
-if you hit a shortcut key.
+YeahConsole is a terminal wrapper for creating drop-down consoles, similar
+to those found in games like Quake.
+
+By default, YeahConsole is activated and hidden with Ctrl+Alt+Y.
 
 WWW: http://phrat.de/yeahtools.html