diff --git a/textproc/jq/Makefile b/textproc/jq/Makefile
index 81a9be54eb90..c6893ef1d8d9 100644
--- a/textproc/jq/Makefile
+++ b/textproc/jq/Makefile
@@ -1,25 +1,29 @@
 # Created by: Jui-Nan Lin <jnlin@csie.nctu.edu.tw>
 # $FreeBSD$
 
 PORTNAME=	jq
-PORTVERSION=	1.1
+PORTVERSION=	1.3
 CATEGORIES=	textproc
+MASTER_SITES=	http://stedolan.github.io/jq/download/source/
 
 MAINTAINER=	jnlin@csie.nctu.edu.tw
 COMMENT=	Lightweight and flexible command-line JSON processor
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	stedolan
-GH_TAGNAME=	jq-${PORTVERSION}
-GH_COMMIT=	bf61e95
-
-USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-docs --docdir="${DOCSDIR}"
 USE_CSTD=	gnu99
 
-PLIST_FILES=	bin/jq
+PLIST_FILES=	bin/${PORTNAME}
+MAN1=		${PORTNAME}.1
 
 NO_STAGE=	yes
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/jq ${PREFIX}/bin
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+PORTDOCS=	*
+.else
+MAKE_ARGS=	docdir=
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/textproc/jq/distinfo b/textproc/jq/distinfo
index 9fe078e5f5b8..e2678fb7a01a 100644
--- a/textproc/jq/distinfo
+++ b/textproc/jq/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jq-1.1.tar.gz) = 0e53d2753e40705a684f499789920f2cebfa7adfbec03a270519c25a5fc03f60
-SIZE (jq-1.1.tar.gz) = 432144
+SHA256 (jq-1.3.tar.gz) = 623f23c36abfc1d96d85020cf421b56f90a229d566f26a4a0d3e8536244bfed7
+SIZE (jq-1.3.tar.gz) = 333678
diff --git a/textproc/jq/files/patch-Makefile b/textproc/jq/files/patch-Makefile
deleted file mode 100644
index 50a38bfeff36..000000000000
--- a/textproc/jq/files/patch-Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./Makefile.orig	2012-11-19 22:03:44.000000000 +0100
-+++ ./Makefile	2012-11-19 22:05:13.000000000 +0100
-@@ -1,4 +1,5 @@
--CC=gcc -Wextra -Wall -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu99 -ggdb -Wno-unused-function
-+CC?=gcc 
-+CFLAGS?=-Wextra -Wall -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu99 -ggdb -Wno-unused-function
- prefix=/usr/local
- 
- .PHONY: all clean releasedep tarball install uninstall test releasetag
-@@ -33,7 +34,7 @@
- 	$(CC) -DJQ_DEBUG=1 -o $@ $^
- 
- jq: $(JQ_SRC) main.c
--	$(CC) -O -DJQ_DEBUG=0 -o $@ $^
-+	$(CC) $(CFLAGS) -DJQ_DEBUG=0 -o $@ $^
- 
- test: jq_test
- 	valgrind --error-exitcode=1 -q --leak-check=full ./jq_test >/dev/null