diff --git a/manifest b/manifest
index 6f5906d400..0d6185d0cc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\sSQLITE_FCNTL_VFS_POINTER\sfile\scontrol\swhich\sobtains\sa\spointer\sto\nthe\stop-level\sVFS\sin\suse\sby\sa\sdatabase\sconnection.
-D 2015-11-28T18:06:36.652
+C Improvements\sto\stemporary\sfile\screation\slogic\sin\sthe\sunix\sVFS.
+D 2015-11-28T21:49:53.832
 F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e928e68168df69b353300ac87c10105206653a03
@@ -323,7 +323,7 @@ F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
 F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
 F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
-F src/os_unix.c 8b35dc3b8b0a789052855cfc6eab6cd1d206fb81
+F src/os_unix.c 951ef130fd491531d03f4ab07ba4ac4df7861364
 F src/os_win.c 386fba30419e8458b13209781c2af5590eab2811
 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 F src/pager.c f92aacd5216d8815136c9e0190041783c602641a
@@ -1405,7 +1405,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 14bbcdc64ecc21f47aed8935858788928ca63107
-R 52e474e0d673136d0f27ca1064e30322
+P 7c6a809e25138950f50554e1fb96e0b6ebbe0bd4
+R ca93330e61d31cc358456a5d19f9fb0f
 U drh
-Z 722f1d3b58c0811ab92bc5ee1b6e0186
+Z a3585e71cbbc630dcd21f2a2025e8592
diff --git a/manifest.uuid b/manifest.uuid
index 1b5072eef9..09f90bf155 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7c6a809e25138950f50554e1fb96e0b6ebbe0bd4
\ No newline at end of file
+d6e177fd09c83d46adc5b5d36e9a439aa5397450
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 43eec4c1f5..82224e18ff 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5395,21 +5395,19 @@ static int fillInUnixFile(
 */
 static const char *unixTempFileDir(void){
   static const char *azDirs[] = {
-     0,
      0,
      0,
      "/var/tmp",
      "/usr/tmp",
      "/tmp",
-     0        /* List terminator */
+     "."
   };
   unsigned int i;
   struct stat buf;
-  const char *zDir = 0;
+  const char *zDir = sqlite3_temp_directory;
 
-  azDirs[0] = sqlite3_temp_directory;
-  if( !azDirs[1] ) azDirs[1] = getenv("SQLITE_TMPDIR");
-  if( !azDirs[2] ) azDirs[2] = getenv("TMPDIR");
+  if( !azDirs[0] ) azDirs[0] = getenv("SQLITE_TMPDIR");
+  if( !azDirs[1] ) azDirs[1] = getenv("TMPDIR");
   for(i=0; i<sizeof(azDirs)/sizeof(azDirs[0]); zDir=azDirs[i++]){
     if( zDir==0 ) continue;
     if( osStat(zDir, &buf) ) continue;
@@ -5427,6 +5425,7 @@ static const char *unixTempFileDir(void){
 */
 static int unixGetTempname(int nBuf, char *zBuf){
   const char *zDir;
+  int iLimit = 0;
 
   /* It's odd to simulate an io-error here, but really this is just
   ** using the io-error infrastructure to test that SQLite handles this
@@ -5435,7 +5434,6 @@ static int unixGetTempname(int nBuf, char *zBuf){
   SimulateIOError( return SQLITE_IOERR );
 
   zDir = unixTempFileDir();
-  if( zDir==0 ) zDir = ".";
   do{
     u64 r;
     sqlite3_randomness(sizeof(r), &r);
@@ -5443,7 +5441,7 @@ static int unixGetTempname(int nBuf, char *zBuf){
     zBuf[nBuf-2] = 0;
     sqlite3_snprintf(nBuf, zBuf, "%s/"SQLITE_TEMP_FILE_PREFIX"%llx%c",
                      zDir, r, 0);
-    if( zBuf[nBuf-2]!=0 ) return SQLITE_ERROR;
+    if( zBuf[nBuf-2]!=0 || (iLimit++)>10 ) return SQLITE_ERROR;
   }while( osAccess(zBuf,0)==0 );
   return SQLITE_OK;
 }
@@ -5715,7 +5713,7 @@ static int unixOpen(
   }else if( !zName ){
     /* If zName is NULL, the upper layer is requesting a temp file. */
     assert(isDelete && !syncDir);
-    rc = unixGetTempname(MAX_PATHNAME+2, zTmpname);
+    rc = unixGetTempname(pVfs->mxPathname, zTmpname);
     if( rc!=SQLITE_OK ){
       return rc;
     }