diff --git a/textproc/mupdf/Makefile b/textproc/mupdf/Makefile
index 32ca86fc3b6..f68d769734e 100644
--- a/textproc/mupdf/Makefile
+++ b/textproc/mupdf/Makefile
@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.18 2010/08/29 10:08:05 matthieu Exp $
+# $OpenBSD: Makefile,v 1.19 2010/09/03 12:38:19 sthen Exp $
 
 COMMENT =	graphic library, pdf parser, viewer and utilities
 
-DISTNAME =	mupdf-0.6
-REVISION =	1
-WRKDIST =	${WRKDIR}/mupdf
+DISTNAME =	mupdf-0.7
 
 CATEGORIES =	textproc x11
 
@@ -20,7 +18,8 @@ PERMIT_DISTFILES_FTP =	Yes
 
 WANTLIB =	X11 Xext c freetype jpeg.>=62 m openjpeg z
 
-MASTER_SITES =	${HOMEPAGE}download/archive/
+MASTER_SITES =	${HOMEPAGE}download/ \
+		${HOMEPAGE}download/archive/
 
 RUN_DEPENDS =	::devel/desktop-file-utils
 BUILD_DEPENDS =	::graphics/jbig2dec
@@ -33,9 +32,9 @@ USE_GMAKE =	Yes
 NO_REGRESS =	Yes
 
 MAKE_ENV +=     CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=${CC} \
-		CXX=${CXX} build=
+		CXX=${CXX} build= verbose=1
 
-CFLAGS +=	-I${LOCALBASE}/include
+CFLAGS +=	-Ifitz -Imupdf -I${LOCALBASE}/include
 LDFLAGS +=	-L${LOCALBASE}/lib
 FAKE_FLAGS =	prefix=${WRKINST}${PREFIX}
 
diff --git a/textproc/mupdf/distinfo b/textproc/mupdf/distinfo
index f70fadabf34..51215fbcc40 100644
--- a/textproc/mupdf/distinfo
+++ b/textproc/mupdf/distinfo
@@ -1,5 +1,5 @@
-MD5 (mupdf-0.6.tar.gz) = 0eGh34+z5NHGAVBnl7dQNg==
-RMD160 (mupdf-0.6.tar.gz) = ULHtHDwHYToduxnP5jy0fU8q4v4=
-SHA1 (mupdf-0.6.tar.gz) = 3VAdpvUMaGxtUZ/mrnyVHS4tfhw=
-SHA256 (mupdf-0.6.tar.gz) = b4fE8RPung9L39OjFu9EBS7cT+vI97UxxKP0T/4UlgU=
-SIZE (mupdf-0.6.tar.gz) = 3607245
+MD5 (mupdf-0.7.tar.gz) = g63E0U6xeDXfeRqaDR6PqQ==
+RMD160 (mupdf-0.7.tar.gz) = gnI2UvuWe+dmXPxV9LK7fD/1W2k=
+SHA1 (mupdf-0.7.tar.gz) = PpfO+pplt3DMG+dYTWpdqdwGTYQ=
+SHA256 (mupdf-0.7.tar.gz) = 5/Ywf6RyV10n/ok+eH3bP8kn8DukriMQX5FxiegZYKY=
+SIZE (mupdf-0.7.tar.gz) = 3557621
diff --git a/textproc/mupdf/patches/patch-Makefile b/textproc/mupdf/patches/patch-Makefile
index 13e62071e44..d1d769a8d7a 100644
--- a/textproc/mupdf/patches/patch-Makefile
+++ b/textproc/mupdf/patches/patch-Makefile
@@ -1,23 +1,24 @@
-$OpenBSD: patch-Makefile,v 1.1 2010/06/03 19:38:34 sthen Exp $
---- Makefile.orig	Wed Jun  2 13:21:22 2010
-+++ Makefile	Thu Jun  3 11:46:32 2010
-@@ -35,10 +35,11 @@ endif
- # Build commands
- #
+$OpenBSD: patch-Makefile,v 1.2 2010/09/03 12:38:19 sthen Exp $
+--- Makefile.orig	Wed Aug 25 15:12:08 2010
++++ Makefile	Fri Sep  3 13:21:43 2010
+@@ -44,13 +44,15 @@ CFLAGS += $(THIRD_INCS) $(SYS_FREETYPE_INC)
+ ifneq "$(verbose)" ""
  
--GENFILE_CMD = @ echo GENFILE $@ && $(firstword $^) $@ $(wordlist 2, 999, $^)
--CC_CMD = @ echo CC $@ && $(CC) -o $@ -c $< $(CFLAGS)
--LD_CMD = @ echo LD $@ && $(LD) -o $@ $^ $(LDFLAGS) $(LIBS)
--AR_CMD = @ echo AR $@ && $(AR) cru $@ $^
-+GENFILE_CMD = $(firstword $^) $@ $(wordlist 2, 999, $^)
+ GENFILE_CMD = $(firstword $^) $@ $(wordlist 2, 999, $^)
 +AS_CMD = $(AS) -o $@ $<
-+CC_CMD = $(CC) -o $@ -c $< $(CFLAGS)
-+LD_CMD = $(LD) -o $@ $^ $(LDFLAGS) $(LIBS)
+ CC_CMD = $(CC) -o $@ -c $< $(CFLAGS)
+ LD_CMD = $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
+-AR_CMD = rm -f $@ && $(AR) cru $@ $^
 +AR_CMD = $(AR) cru $@ $^
  
- #
- # Directories
-@@ -57,6 +58,10 @@ FONTDUMP_EXE=$(OBJDIR)/fontdump
+ else
+ 
+ GENFILE_CMD = @ echo GENFILE $@ && $(firstword $^) $@ $(wordlist 2, 999, $^)
++AS_CMD = @ echo AS $@ && $(AS) -o $@ $<
+ CC_CMD = @ echo CC $@ && $(CC) -o $@ -c $< $(CFLAGS)
+ LD_CMD = @ echo LD $@ && $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
+ AR_CMD = @ echo AR $@ && rm -f $@ && $(AR) cru $@ $^
+@@ -65,6 +67,10 @@ FONTDUMP_EXE := $(OBJDIR)/fontdump
  $(FONTDUMP_EXE): $(OBJDIR)/fontdump.o
  	$(LD_CMD)
  
@@ -25,10 +26,10 @@ $OpenBSD: patch-Makefile,v 1.1 2010/06/03 19:38:34 sthen Exp $
 +$(FONTRES_EXE): $(OBJDIR)/fontres.o
 +	$(LD_CMD)
 +
- CMAPDUMP_EXE=$(OBJDIR)/cmapdump
+ CMAPDUMP_EXE := $(OBJDIR)/cmapdump
  $(CMAPDUMP_EXE): $(OBJDIR)/cmapdump.o
  	$(LD_CMD)
-@@ -110,6 +115,8 @@ $(OBJDIR)/%.o: mupdf/%.c
+@@ -179,6 +185,8 @@ $(OBJDIR)/%.o: mupdf/%.c
  	$(CC_CMD)
  $(OBJDIR)/%.o: $(GENDIR)/%.c
  	$(CC_CMD)
@@ -37,7 +38,7 @@ $OpenBSD: patch-Makefile,v 1.1 2010/06/03 19:38:34 sthen Exp $
  
  #
  # Generated font file dumps
-@@ -129,18 +136,18 @@ CJKFONT_FILES=fonts/droid/DroidSansFallback.ttf
+@@ -206,18 +214,18 @@ CJKFONT_FILES := \
  
  ifeq "$(pregen)" ""
  
@@ -50,14 +51,14 @@ $OpenBSD: patch-Makefile,v 1.1 2010/06/03 19:38:34 sthen Exp $
  
  endif
  
- FONT_SRC=\
+ FONT_SRC := \
 -	$(GENDIR)/font_base14.c \
 -	$(GENDIR)/font_cjk.c
 +	$(GENDIR)/font_base14.s \
 +	$(GENDIR)/font_cjk.s
  
--FONT_OBJ=$(FONT_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.o)
-+FONT_OBJ=$(FONT_SRC:$(GENDIR)/%.s=$(OBJDIR)/%.o)
+-FONT_OBJ := $(FONT_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.o)
++FONT_OBJ := $(FONT_SRC:$(GENDIR)/%.s=$(OBJDIR)/%.o)
+ 
  
  #
- # Generated CMap file dumps
diff --git a/textproc/mupdf/patches/patch-Makerules b/textproc/mupdf/patches/patch-Makerules
index 4a6e57ba865..59091aceee4 100644
--- a/textproc/mupdf/patches/patch-Makerules
+++ b/textproc/mupdf/patches/patch-Makerules
@@ -1,22 +1,20 @@
-$OpenBSD: patch-Makerules,v 1.1 2010/06/03 19:38:34 sthen Exp $
---- Makerules.orig	Tue Jun  1 20:11:36 2010
-+++ Makerules	Thu Jun  3 04:45:42 2010
-@@ -4,9 +4,9 @@ OS := $(shell uname)
+$OpenBSD: patch-Makerules,v 1.2 2010/09/03 12:38:19 sthen Exp $
+--- Makerules.orig	Wed Aug 25 15:12:08 2010
++++ Makerules	Sun Aug 29 12:34:26 2010
+@@ -4,8 +4,8 @@ OS ?= $(shell uname)
  OS := $(OS:MINGW%=MINGW)
  
- LIBS := -ljbig2dec -lopenjpeg -ljpeg -lz -lm
--CFLAGS := -Wall --std=gnu99 -Ifitz -Imupdf $(THIRD_INCS)
--LDFLAGS =
--CC = cc
-+CFLAGS += -Wall --std=gnu99 -Ifitz -Imupdf $(THIRD_INCS)
-+LDFLAGS ?=
-+CC ?= cc
- LD = $(CC)
- AR = ar
+ CC ?= cc
+-CFLAGS := -Ifitz -Imupdf -Wall
+-LDFLAGS :=
++CFLAGS += -Ifitz -Imupdf -Wall
++LDFLAGS +=
  
-@@ -29,6 +29,15 @@ ifeq  "$(build)" "release"
- CFLAGS += -mmmx -ftree-vectorize -msse -msse2 -march=k8 -DARCH_X86
- ARCH_SRC = archx86.c
+ ifeq "$(build)" "debug"
+ CFLAGS += -pipe -g
+@@ -46,6 +46,15 @@ else
+ CFLAGS += -m32
+ LDFLAGS += -m32
  endif
 +endif
 +
@@ -29,4 +27,4 @@ $OpenBSD: patch-Makerules,v 1.1 2010/06/03 19:38:34 sthen Exp $
 +PDFVIEW_EXE = $(X11VIEW_EXE)
  endif
  
- ifeq "$(OS)" "Darwin"
+ # MinGW build depends on thirdparty libs
diff --git a/textproc/mupdf/patches/patch-debian_mupdf_1 b/textproc/mupdf/patches/patch-debian_mupdf_1
new file mode 100644
index 00000000000..87abfb6184d
--- /dev/null
+++ b/textproc/mupdf/patches/patch-debian_mupdf_1
@@ -0,0 +1,81 @@
+$OpenBSD: patch-debian_mupdf_1,v 1.1 2010/09/03 12:38:19 sthen Exp $
+--- debian/mupdf.1.orig	Fri Sep  3 13:21:50 2010
++++ debian/mupdf.1	Fri Sep  3 13:29:19 2010
+@@ -32,11 +32,11 @@ Shift is pressed on the other hand then the page is pa
+ These commands relate to the actual page number in the PDF file, not to
+ numbers given by any kind of page label.
+ .TP
+-.B f, space
++.B space
+ Go to the next page without paning to top of page. If a number has been
+ entered, go that number of pages forward instead of just one page.
+ .TP
+-.B b, backspace
++.B b
+ Go to the previous page without paning to top of page. If a number has been
+ entered, go that number of pages backwards instead of just one page.
+ .TP
+@@ -47,25 +47,27 @@ first page.
+ .B G
+ Go to the last page.
+ .TP
+-.B t
+-Tag the viewed page and record it in the history. When clicking links
+-within a PDF file to follow the link pages are automatically tagged.
+-.TP
+ .B m
++Mark the current page with a tag.
++When clicking to follow links within a PDF file,
++the link pages are automatically tagged.
++.TP
++.B t
+ Return to the previously tagged page in the history.
+ .TP
+-.B p
+-Go to the previous page and pan to bottom of page. If a number has been
+-entered, go that number of pages backwards instead of just one page.
++.B /
++Search for text.
+ .TP
+ .B n
+-Go to the next page and pan to top of page. If a number has been entered,
+-go that number of pages forward instead of just one page.
++Find next search result.
+ .TP
+-.B B
++.B N
++Find previous search result.
++.TP
++.B <
+ Go ten pages backwards and pan to top of page.
+ .TP
+-.B F
++.B >
+ Go ten pages forward and pan to top of page.
+ .TP
+ .B PAN PAGE
+@@ -96,10 +98,10 @@ Zoom in.
+ .B \-
+ Zoom out.
+ .TP
+-.B <
++.B L
+ Rotate page counter-clockwise or left by 90\(de.
+ .TP
+-.B >
++.B R
+ Rotate page clockwise or right by 90\(de.
+ .TP
+ .B a
+@@ -107,6 +109,11 @@ Rotate page counter-clockwise or left by 15\(de.
+ .TP
+ .B s
+ Rotate page clockwise or right by 15\(de.
++.TP
++.B OTHER COMMANDS
++.TP
++.B c
++Toggle between colour and grayscale.
+ .TP
+ .B FILE HANDLING
+ .TP
diff --git a/textproc/mupdf/patches/patch-debian_mupdf_desktop b/textproc/mupdf/patches/patch-debian_mupdf_desktop
index 4da5ff25509..fd3b51948ad 100644
--- a/textproc/mupdf/patches/patch-debian_mupdf_desktop
+++ b/textproc/mupdf/patches/patch-debian_mupdf_desktop
@@ -1,8 +1,8 @@
-$OpenBSD: patch-debian_mupdf_desktop,v 1.1 2010/06/03 19:38:34 sthen Exp $
---- debian/mupdf.desktop.orig	Thu Apr 29 21:26:43 2010
-+++ debian/mupdf.desktop	Thu Jun  3 11:32:28 2010
+$OpenBSD: patch-debian_mupdf_desktop,v 1.2 2010/09/03 12:38:19 sthen Exp $
+--- debian/mupdf.desktop.orig	Wed Aug 25 15:12:11 2010
++++ debian/mupdf.desktop	Sun Aug 29 12:32:05 2010
 @@ -8,8 +8,9 @@ TryExec=mupdf
- Icon=mupdf.xpm
+ Icon=mupdf
  Terminal=false
  Type=Application
 -MimeType=application/pdf;pplication/x-pdf;
diff --git a/textproc/mupdf/patches/patch-fitz_fitz_base_h b/textproc/mupdf/patches/patch-fitz_fitz_base_h
deleted file mode 100644
index e77eaac9bfa..00000000000
--- a/textproc/mupdf/patches/patch-fitz_fitz_base_h
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-fitz_fitz_base_h,v 1.1 2010/06/03 19:38:34 sthen Exp $
---- fitz/fitz_base.h.orig	Mon May 31 15:16:48 2010
-+++ fitz/fitz_base.h	Thu Jun  3 04:13:00 2010
-@@ -53,6 +53,10 @@ extern int gettimeofday(struct timeval *tv, struct tim
- 
- #else /* C99 or close enough */
- 
-+#ifndef restrict
-+#define restrict
-+#endif
-+
- #include <unistd.h>
- 
- #endif
diff --git a/textproc/mupdf/pkg/PLIST b/textproc/mupdf/pkg/PLIST
index 0fb5a85a978..9bb9f22417a 100644
--- a/textproc/mupdf/pkg/PLIST
+++ b/textproc/mupdf/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2010/06/03 19:38:34 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.4 2010/09/03 12:38:19 sthen Exp $
 @bin bin/mupdf
 @bin bin/pdfclean
 @bin bin/pdfdraw
@@ -6,9 +6,6 @@
 @bin bin/pdfinfo_mupdf
 @bin bin/pdfshow
 include/fitz.h
-include/fitz_base.h
-include/fitz_draw.h
-include/fitz_stream.h
 include/mupdf.h
 lib/libmupdf.a
 lib/pkgconfig/