Index: trunk/psModules/src/concepts/pmConcepts.c
===================================================================
--- trunk/psModules/src/concepts/pmConcepts.c	(revision 23832)
+++ trunk/psModules/src/concepts/pmConcepts.c	(revision 24777)
@@ -485,4 +485,28 @@
         concept[length - 1] = '\0';
 
+	// special variants:
+	if (!strcmp(concept, "FPA.DATE")) {
+	  psTime *fpaTime = psMetadataLookupPtr(NULL, fpa->concepts, "FPA.TIME");
+	  if (!fpaTime) {
+	    psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Missing concept FPA.TIME needed for FPA.DATE");
+	    psFree(string);
+	    return NULL;
+	  }
+	  psString dateTimeString = psTimeToISO(fpaTime); // String representation
+	  psList *dateTime = psStringSplit(dateTimeString, "T", true);
+	  psFree(dateTimeString);
+	  psString dateString = psMemIncrRefCounter(psListGet(dateTime, PS_LIST_HEAD)); // The date string
+	  psFree (dateTime);
+
+	  if (!psStringSubstitute(&string, dateString, "{FPA.DATE}")) {
+	      psError(PS_ERR_UNKNOWN, false, "Unable to replace concept %s", concept);
+	      psFree(string); 
+	      psFree(dateString);
+	      return NULL; 
+	  }
+	  psFree (dateString);
+	  continue;
+	}
+
         psTrace("psModules.concepts", 7, "Interpolating concept %s", concept);