diff --git a/include/osmocom/smpp/smpp.h b/include/osmocom/smpp/smpp.h
index cc0e800..df5e163 100644
--- a/include/osmocom/smpp/smpp.h
+++ b/include/osmocom/smpp/smpp.h
@@ -11,6 +11,12 @@
 	READ_ST_IN_MSG = 1,
 };
 
+#define LOGPESME(ESME, LEVEL, FMT, ARGS...)            \
+	LOGP(DSMPP, LEVEL, "[%s] " FMT, (ESME)->system_id, ##ARGS)
+
+#define LOGPESMERR(ESME, FMT, ARGS...)                 \
+	LOGPESME(ESME, LOGL_ERROR, "Error (%s) " FMT, smpp34_strerror, ##ARGS)
+
 /*! \brief Ugly wrapper. libsmpp34 should do this itself! */
 #define SMPP34_UNPACK(rc, type, str, data, len) {	\
 		memset(str, 0, sizeof(*str));				\