diff --git a/net/foreman-proxy/Makefile b/net/foreman-proxy/Makefile
index 564eb7d31963..5c2d0f2a14f1 100644
--- a/net/foreman-proxy/Makefile
+++ b/net/foreman-proxy/Makefile
@@ -1,92 +1,91 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	foreman-proxy
-DISTVERSION=	1.4.0-RC2
-PORTREVISION=	1
+PORTVERSION=	1.4.0
 CATEGORIES=	net
 MASTER_SITES=	GH
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Foreman Smart Proxy
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=    rubygem-sinatra>=1.4.3:${PORTSDIR}/www/rubygem-sinatra \
 		rubygem-json>=1.8.1:${PORTSDIR}/devel/rubygem-json
 
 OPTIONS_DEFINE= BMC PUPPET
 BMC_DESC=	Depend on rubyipmi for BMC support
 PUPPET_DESC=	Depend on Puppet
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	theforeman
 GH_PROJECT=	smart-proxy
-GH_COMMIT= 	255c9bf
+GH_COMMIT= 	ae165b9
 USE_RUBY=	yes
 USE_RAKE=	yes
 USE_RC_SUBR=	foreman-proxy
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 
 FOREMAN_PROXY_USER?=	foreman_proxy
 FOREMAN_PROXY_GROUP?=	foreman_proxy
 FOREMAN_PROXY_LOGDIR?=	/var/log/foreman-proxy
 FOREMAN_PROXY_RUNDIR?=	/var/run/foreman-proxy
 
 USERS=		${FOREMAN_PROXY_USER}
 GROUPS=		${FOREMAN_PROXY_GROUP}
 
 SUB_FILES+=	pkg-install
 SUB_LIST+=	RUBY="${RUBY}" \
 		FOREMAN_PROXY_USER="${FOREMAN_PROXY_USER}" \
 		FOREMAN_PROXY_GROUP="${FOREMAN_PROXY_GROUP}" \
 		FOREMAN_PROXY_RUNDIR="${FOREMAN_PROXY_RUNDIR}" \
 		FOREMAN_PROXY_LOGDIR="${FOREMAN_PROXY_LOGDIR}"
 
 PLIST_SUB+=	${SUB_LIST} \
 		MKDIR="${MKDIR}"
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBMC}
 RUN_DEPENDS+=	rubygem-rubyipmi>=0.7:${PORTSDIR}/sysutils/rubygem-rubyipmi
 .endif
 
 .if ${PORT_OPTIONS:MPUPPET}
 RUN_DEPENDS+=	puppet:${PORTSDIR}/sysutils/puppet
 .endif
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "s|/usr/bin/env ruby|${RUBY}|g" \
 		-e "s|#{File.dirname(__FILE__)}/..|${DATADIR}|g" \
 		${WRKSRC}/bin/smart-proxy
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${WRKSRC}/config/settings.yml.example
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${LN} -s ${PREFIX}/etc/foreman-proxy ${STAGEDIR}${DATADIR}/config
 	@${INSTALL_SCRIPT} ${WRKSRC}/bin/smart-proxy \
 		${STAGEDIR}${PREFIX}/sbin/smart-proxy
 .for file in Rakefile config.ru lib public views
 	@${CP} -r ${WRKSRC}/${file} ${STAGEDIR}${DATADIR}
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/config/settings.yml.example \
 		${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.yml.sample
 .if !exists(${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.yml)
 	@${INSTALL_DATA} ${WRKSRC}/config/settings.yml.example \
 		${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.yml
 .endif
 
 post-install:
 	@${MKDIR} -m 0700 ${STAGEDIR}${FOREMAN_PROXY_LOGDIR} \
 		${STAGEDIR}${FOREMAN_PROXY_RUNDIR}
 	@${SH} ${PKGINSTALL} STAGEDIR=${STAGEDIR}
 
 .include <bsd.port.post.mk>
diff --git a/net/foreman-proxy/distinfo b/net/foreman-proxy/distinfo
index ecf184f9cdf1..7ffeb4b1ec49 100644
--- a/net/foreman-proxy/distinfo
+++ b/net/foreman-proxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (foreman-proxy-1.4.0-RC2.tar.gz) = bbe0f3be114b8fb406e79fdd845690ad69d83915ccd1513fbc3deb71b894343a
-SIZE (foreman-proxy-1.4.0-RC2.tar.gz) = 84992
+SHA256 (foreman-proxy-1.4.0.tar.gz) = 082a6800eaafa38647b5b849be1c96602ec8cd1f1d3c00aa46db6d1f917481df
+SIZE (foreman-proxy-1.4.0.tar.gz) = 85030
diff --git a/net/foreman-proxy/files/patch-lib-proxy-tftp.rb b/net/foreman-proxy/files/patch-lib-proxy-tftp.rb
index f3c18dd53063..d2c32dcd70a9 100644
--- a/net/foreman-proxy/files/patch-lib-proxy-tftp.rb
+++ b/net/foreman-proxy/files/patch-lib-proxy-tftp.rb
@@ -1,11 +1,14 @@
---- lib/proxy/tftp.rb.orig	2014-01-29 00:26:35.629061321 +0100
-+++ lib/proxy/tftp.rb	2014-01-29 00:28:05.669054835 +0100
-@@ -104,7 +104,7 @@
+--- lib/proxy/tftp.rb.orig	2014-01-29 11:01:36.000000000 +0100
++++ lib/proxy/tftp.rb	2014-02-08 12:38:15.087475784 +0100
+@@ -105,8 +105,9 @@
        # as the dst might contain another sub directory
        FileUtils.mkdir_p destination.parent
  
--      cmd = "wget --timeout=10 --tries=3 --no-check-certificate -nv -c #{src} -O \"#{destination}\""
+-      wget = which("wget")
+-      cmd = "#{wget} --timeout=10 --tries=3 --no-check-certificate -nv -c #{src} -O \"#{destination}\""
++      # wget = which("wget")
++      # cmd = "#{wget} --timeout=10 --tries=3 --no-check-certificate -nv -c #{src} -O \"#{destination}\""
 +      cmd = "/usr/bin/fetch --timeout=10 --no-verify-hostname --no-verify-peer -a -m -q -o \"#{destination}\" #{src}"
-       Proxy::Util::CommandTask.new(cmd)
+       CommandTask.new(cmd)
      end
    end