diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index 5d5e0faafff..54d552266e9 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.11 2011/03/17 14:55:59 shadchin Exp $
+# $OpenBSD: Makefile,v 1.12 2011/04/25 13:19:23 shadchin Exp $
 # $FreeBSD: ports/editors/texmaker/Makefile,v 1.2 2004/01/09 09:16:33 krion Exp $
 
 COMMENT=		LaTeX development environment
-DISTNAME=		texmaker-2.3
+DISTNAME=		texmaker-3.0.1
 CATEGORIES=		editors
 
 HOMEPAGE=		http://www.xm1math.net/texmaker/
diff --git a/editors/texmaker/distinfo b/editors/texmaker/distinfo
index eac7464e9c8..28ace84e03b 100644
--- a/editors/texmaker/distinfo
+++ b/editors/texmaker/distinfo
@@ -1,5 +1,5 @@
-MD5 (texmaker-2.3.tar.bz2) = qctHJSQzM67a6SVO90OakQ==
-RMD160 (texmaker-2.3.tar.bz2) = pNsEy2E105NnGpFu2zwnJCCpjKM=
-SHA1 (texmaker-2.3.tar.bz2) = vNIaOhbtCkw4rE3uzinwPQlkQx4=
-SHA256 (texmaker-2.3.tar.bz2) = dZNK0v0D8ADmUwbjNtiOUWYoSpIiMS+IeApJJVXMj9g=
-SIZE (texmaker-2.3.tar.bz2) = 4364743
+MD5 (texmaker-3.0.1.tar.bz2) = DpbL0+gXE2PChY++lusbqg==
+RMD160 (texmaker-3.0.1.tar.bz2) = GLJolatGxvl4HoBsG3kzXWJuPnA=
+SHA1 (texmaker-3.0.1.tar.bz2) = oWDtouVv2dup9oSZ5NXdYvi2amk=
+SHA256 (texmaker-3.0.1.tar.bz2) = ut3odwipW9VOZdPRdZX3kEhgUwAAUpJvhgrVt+A89uc=
+SIZE (texmaker-3.0.1.tar.bz2) = 5180509
diff --git a/editors/texmaker/patches/patch-configdialog_cpp b/editors/texmaker/patches/patch-configdialog_cpp
new file mode 100644
index 00000000000..b77aa0683cd
--- /dev/null
+++ b/editors/texmaker/patches/patch-configdialog_cpp
@@ -0,0 +1,12 @@
+$OpenBSD: patch-configdialog_cpp,v 1.1 2011/04/25 13:19:23 shadchin Exp $
+--- configdialog.cpp.orig	Tue Apr  5 21:54:50 2011
++++ configdialog.cpp	Tue Apr  5 21:55:31 2011
+@@ -124,7 +124,7 @@ QDir spelldir(QCoreApplication::applicationDirPath());
+ #ifdef DEBIAN_SPELLDIR
+ QDir spelldir(PREFIX"/share/myspell/dicts");
+ #else
+-QDir spelldir(PREFIX"/share/texmaker");
++QDir spelldir(PREFIX"/share/hunspell");
+ #endif
+ #endif
+ 
diff --git a/editors/texmaker/patches/patch-latexeditorview_h b/editors/texmaker/patches/patch-latexeditorview_h
index e4ce2d903c5..e9104e19745 100644
--- a/editors/texmaker/patches/patch-latexeditorview_h
+++ b/editors/texmaker/patches/patch-latexeditorview_h
@@ -1,10 +1,10 @@
-$OpenBSD: patch-latexeditorview_h,v 1.1 2010/10/27 08:52:47 sthen Exp $
---- latexeditorview.h.orig	Sat Feb  6 17:20:18 2010
-+++ latexeditorview.h	Sat Feb  6 17:20:30 2010
-@@ -18,7 +18,7 @@
- #include "latexeditor.h"
+$OpenBSD: patch-latexeditorview_h,v 1.2 2011/04/25 13:19:23 shadchin Exp $
+--- latexeditorview.h.orig	Fri Apr  1 18:28:44 2011
++++ latexeditorview.h	Tue Apr  5 21:42:18 2011
+@@ -19,7 +19,7 @@
  #include "linenumberwidget.h"
  #include "findwidget.h"
+ #include "minisplitter.h"
 -#include "hunspell/hunspell.hxx"
 +#include <hunspell.hxx>
  
diff --git a/editors/texmaker/patches/patch-texmaker_cpp b/editors/texmaker/patches/patch-texmaker_cpp
index 346396c7bd5..de47e40e586 100644
--- a/editors/texmaker/patches/patch-texmaker_cpp
+++ b/editors/texmaker/patches/patch-texmaker_cpp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-texmaker_cpp,v 1.3 2011/03/17 14:55:59 shadchin Exp $
---- texmaker.cpp.orig	Sun Mar 13 23:35:01 2011
-+++ texmaker.cpp	Wed Mar 16 22:14:15 2011
-@@ -3195,7 +3195,7 @@ author=config->value("Quick/Author","").toString();
+$OpenBSD: patch-texmaker_cpp,v 1.4 2011/04/25 13:19:23 shadchin Exp $
+--- texmaker.cpp.orig	Sat Apr 16 18:09:18 2011
++++ texmaker.cpp	Sun Apr 17 22:42:12 2011
+@@ -3473,7 +3473,7 @@ author=config->value("Quick/Author","").toString();
  #ifdef USB_VERSION
  QString dicDir=QCoreApplication::applicationDirPath() + "/";
  #else
@@ -10,7 +10,7 @@ $OpenBSD: patch-texmaker_cpp,v 1.3 2011/03/17 14:55:59 shadchin Exp $
  #endif
  
  #endif
-@@ -3207,7 +3207,7 @@ QString dicDir=QCoreApplication::applicationDirPath() 
+@@ -3485,7 +3485,7 @@ QString dicDir=QCoreApplication::applicationDirPath() 
  #endif
  QString defaultDic=dicDir+QString(QLocale::system().name())+".dic";
  QFileInfo fi(defaultDic);
diff --git a/editors/texmaker/patches/patch-texmaker_h b/editors/texmaker/patches/patch-texmaker_h
index 02ed104d585..2ae32b164f1 100644
--- a/editors/texmaker/patches/patch-texmaker_h
+++ b/editors/texmaker/patches/patch-texmaker_h
@@ -1,12 +1,12 @@
-$OpenBSD: patch-texmaker_h,v 1.2 2011/03/17 14:55:59 shadchin Exp $
---- texmaker.h.orig	Sat Mar 12 16:18:43 2011
-+++ texmaker.h	Wed Mar 16 22:12:04 2011
-@@ -44,7 +44,7 @@
+$OpenBSD: patch-texmaker_h,v 1.3 2011/04/25 13:19:23 shadchin Exp $
+--- texmaker.h.orig	Sun Apr  3 15:04:18 2011
++++ texmaker.h	Tue Apr  5 21:40:49 2011
+@@ -47,7 +47,7 @@
  #include "logeditor.h"
  #include "gotolinedialog.h"
  #include "replacedialog.h"
 -#include "hunspell/hunspell.hxx"
 +#include <hunspell.hxx>
  #include "browser.h"
+ #include "pdfviewerwidget.h"
  #include "pdfviewer.h"
- #include "encodingprober/qencodingprober.h"
diff --git a/editors/texmaker/patches/patch-texmaker_pro b/editors/texmaker/patches/patch-texmaker_pro
index 09d656a57f5..5dd2058db72 100644
--- a/editors/texmaker/patches/patch-texmaker_pro
+++ b/editors/texmaker/patches/patch-texmaker_pro
@@ -1,6 +1,6 @@
-$OpenBSD: patch-texmaker_pro,v 1.3 2011/03/17 14:55:59 shadchin Exp $
---- texmaker.pro.orig	Sun Mar 13 13:30:30 2011
-+++ texmaker.pro	Wed Mar 16 22:13:09 2011
+$OpenBSD: patch-texmaker_pro,v 1.4 2011/04/25 13:19:23 shadchin Exp $
+--- texmaker.pro.orig	Sun Apr  3 16:16:58 2011
++++ texmaker.pro	Tue Apr  5 21:45:23 2011
 @@ -4,7 +4,8 @@ TARGET	 = texmaker
  QT += network \
        xml \
@@ -8,11 +8,11 @@ $OpenBSD: patch-texmaker_pro,v 1.3 2011/03/17 14:55:59 shadchin Exp $
 -CONFIG	+= qt warn_off release
 +CONFIG	+= qt warn_off release link_pkgconfig
 +PKGCONFIG = hunspell poppler-qt4
- TEXMAKERVERSION=2.3
+ TEXMAKERVERSION=3.0.1
  DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
  DEFINES += HAVE_SPLASH
-@@ -53,25 +54,6 @@ HEADERS	+= texmaker.h \
- 	encodingdialog.h \
+@@ -56,25 +57,6 @@ HEADERS	+= texmaker.h \
+ 	usercompletiondialog.h \
  	synctex_parser.h \
  	synctex_parser_utils.h \
 -	hunspell/affentry.hxx \
@@ -37,8 +37,8 @@ $OpenBSD: patch-texmaker_pro,v 1.3 2011/03/17 14:55:59 shadchin Exp $
  	singleapp/qtlocalpeer.h \
  	singleapp/qtlockedfile.h \
  	singleapp/qtsingleapplication.h \
-@@ -144,18 +126,6 @@ SOURCES	+= main.cpp \
- 	encodingdialog.cpp \
+@@ -150,18 +132,6 @@ SOURCES	+= main.cpp \
+ 	usercompletiondialog.cpp \
  	synctex_parser.c \
  	synctex_parser_utils.c \
 -	hunspell/affentry.cxx \
@@ -56,7 +56,7 @@ $OpenBSD: patch-texmaker_pro,v 1.3 2011/03/17 14:55:59 shadchin Exp $
  	singleapp/qtlocalpeer.cpp \
  	singleapp/qtlockedfile.cpp \
  	singleapp/qtsingleapplication.cpp \
-@@ -320,23 +290,7 @@ utilities.files = doc/doc1.png \
+@@ -319,23 +289,7 @@ utilities.files = doc/doc1.png \
  	locale/texmaker_zh_CN.qm \
  	locale/texmaker_zh_TW.qm \
  	locale/texmaker_cs.qm \
diff --git a/editors/texmaker/pkg/PLIST b/editors/texmaker/pkg/PLIST
index b8b9b4b2a2c..ef027efda8c 100644
--- a/editors/texmaker/pkg/PLIST
+++ b/editors/texmaker/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2011/03/02 14:04:21 shadchin Exp $
+@comment $OpenBSD: PLIST,v 1.4 2011/04/25 13:19:23 shadchin Exp $
 @bin bin/texmaker
 share/applications/texmaker.desktop
 share/pixmaps/
@@ -7,7 +7,6 @@ share/texmaker/
 share/texmaker/AUTHORS
 share/texmaker/CHANGELOG.txt
 share/texmaker/COPYING
-share/texmaker/blank.png
 share/texmaker/doc1.png
 share/texmaker/doc10.png
 share/texmaker/doc11.png
@@ -32,11 +31,6 @@ share/texmaker/doc7.png
 share/texmaker/doc8.png
 share/texmaker/doc9.png
 share/texmaker/latexhelp.html
-share/texmaker/next.gif
-share/texmaker/next_d.gif
-share/texmaker/prev.gif
-share/texmaker/prev_d.gif
-share/texmaker/psheader.txt
 share/texmaker/qt_cs.qm
 share/texmaker/qt_de.qm
 share/texmaker/qt_es.qm
@@ -45,7 +39,6 @@ share/texmaker/qt_pt.qm
 share/texmaker/qt_ru.qm
 share/texmaker/qt_zh_CN.qm
 share/texmaker/qt_zh_TW.qm
-share/texmaker/style.css
 share/texmaker/texmaker.svg
 share/texmaker/texmaker128x128.png
 share/texmaker/texmaker16x16.png
@@ -66,8 +59,6 @@ share/texmaker/texmaker_pt_BR.qm
 share/texmaker/texmaker_ru.qm
 share/texmaker/texmaker_zh_CN.qm
 share/texmaker/texmaker_zh_TW.qm
-share/texmaker/up.gif
-share/texmaker/up_d.gif
 share/texmaker/usermanual_en.html
 share/texmaker/usermanual_fr.html
 @exec %D/bin/update-desktop-database