diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c
index 9b1cf27df4c..e71a247e895 100644
--- a/programs/regedit/edit.c
+++ b/programs/regedit/edit.c
@@ -107,7 +107,7 @@ static BOOL change_dword_base(HWND hwndDlg, BOOL toHex)
     DWORD val;
 
     if (!GetDlgItemText(hwndDlg, IDC_VALUE_DATA, buf, COUNT_OF(buf))) return FALSE;
-    if (!_stscanf(buf, toHex ? "%ld" : "%lx", &val)) return FALSE;
+    if (!_stscanf(buf, toHex ? "%d" : "%x", &val)) return FALSE;
     wsprintf(buf, toHex ? "%lx" : "%ld", val);
     return SetDlgItemText(hwndDlg, IDC_VALUE_DATA, buf);    
 }
@@ -308,7 +308,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR valueName)
 	wsprintf(stringValueData, isDecimal ? "%ld" : "%lx", *((DWORD*)stringValueData));
 	if (DialogBox(0, MAKEINTRESOURCE(IDD_EDIT_DWORD), hwnd, modify_dlgproc) == IDOK) {
 	    DWORD val;
-	    if (_stscanf(stringValueData, isDecimal ? "%ld" : "%lx", &val)) {
+	    if (_stscanf(stringValueData, isDecimal ? "%d" : "%x", &val)) {
 		lRet = RegSetValueEx(hKey, valueName, 0, type, (BYTE*)&val, sizeof(val));
 		if (lRet == ERROR_SUCCESS) result = TRUE;
 		else error_code_messagebox(hwnd, lRet);
diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c
index 62558be18a6..1ede60ffda5 100644
--- a/programs/regedit/regedit.c
+++ b/programs/regedit/regedit.c
@@ -177,7 +177,7 @@ BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s)
                 }
                 if (size==0)
                 {
-                    fprintf(stderr,"%s: File not found \"%s\" (%ld)\n",
+                    fprintf(stderr,"%s: File not found \"%s\" (%d)\n",
                             getAppName(),filename,GetLastError());
                     exit(1);
                 }