diff --git a/contrib/.gitignore b/contrib/.gitignore
index c2d09c33..85acde38 100644
--- a/contrib/.gitignore
+++ b/contrib/.gitignore
@@ -1,2 +1,3 @@
 nghttpx-init
 nghttpx.service
+nghttpx-upstart.conf
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 596dc431..07a3bf8b 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -21,7 +21,7 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-configfiles = nghttpx-init nghttpx.service
+configfiles = nghttpx-init nghttpx.service nghttpx-upstart.conf
 
 EXTRA_DIST = $(configfiles:%=%.in) nghttpx-logrotate
 
@@ -33,7 +33,7 @@ nghttpx-init: %: $(srcdir)/%.in
 	chmod +x $@.tmp
 	mv $@.tmp $@
 
-nghttpx.service: %: $(srcdir)/%.in
+nghttpx.service nghttpx-upstart.conf: %: $(srcdir)/%.in
 	$(edit) $< > $@
 
 $(configfiles): Makefile
diff --git a/contrib/nghttpx-upstart.conf b/contrib/nghttpx-upstart.conf.in
similarity index 82%
rename from contrib/nghttpx-upstart.conf
rename to contrib/nghttpx-upstart.conf.in
index 0d2a33a7..0b799160 100644
--- a/contrib/nghttpx-upstart.conf
+++ b/contrib/nghttpx-upstart.conf.in
@@ -5,4 +5,4 @@ description "HTTP/2 reverse proxy"
 start on runlevel [2]
 stop on runlevel [016]
 
-exec /usr/bin/nghttpx
+exec @bindir@/nghttpx