diff --git a/nupdf/Makefile b/nupdf/Makefile
index 4a789b6..d6b4f2d 100644
--- a/nupdf/Makefile
+++ b/nupdf/Makefile
@@ -46,7 +46,7 @@ define Package/nupdf/install
 		$(1)/usr/bin $(1)/usr/share/nupdf
 
 	$(INSTALL_BIN) \
-		$(PKG_BUILD_DIR)/nupdf $(1)/usr/bin/nupdf.bin
+		$(PKG_BUILD_DIR)/nupdf $(1)/usr/share/nupdf/nupdf.bin
 
 	$(INSTALL_BIN) \
 		$(FILES_DIR)/nupdf.sh $(1)/usr/bin/nupdf
diff --git a/nupdf/files/nupdf.sh b/nupdf/files/nupdf.sh
index 3336390..25b6d1a 100644
--- a/nupdf/files/nupdf.sh
+++ b/nupdf/files/nupdf.sh
@@ -1,3 +1,11 @@
 #!/bin/sh
+
+if [ "${1#/}" = "$1" ]; 
+then
+	f=`pwd`/$1;
+else 
+	f=$1;
+fi; 
+
 cd /usr/share/nupdf
-/usr/bin/nupdf.bin $*
+./nupdf.bin "$f"