diff --git a/libavformat/http.c b/libavformat/http.c
index b052683790..e992865442 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -184,13 +184,13 @@ static int http_connect(URLContext *h, const char *path, const char *hoststr)
 
     snprintf(s->buffer, sizeof(s->buffer),
              "%s %s HTTP/1.0\n"
-             "User-Agent: FFmpeg %s\n"
+             "User-Agent: %s\n"
              "Accept: */*\n"
              "Host: %s\n"
              "\n",
              post ? "POST" : "GET",
              path,
-             LIBAVFORMAT_VERSION,
+             LIBAVFORMAT_IDENT,
              hoststr);
     
     if (http_write(h, s->buffer, strlen(s->buffer)) < 0)
diff --git a/libavformat/ogg.c b/libavformat/ogg.c
index c127ff747c..129c8c462e 100644
--- a/libavformat/ogg.c
+++ b/libavformat/ogg.c
@@ -63,7 +63,7 @@ static int ogg_write_header(AVFormatContext *avfcontext)
 	vorbis_block_init(&vd, &vb) ;
 	
 	vorbis_comment_init(&vc) ;
-	vorbis_comment_add_tag(&vc, "encoder", "ffmpeg") ;
+	vorbis_comment_add_tag(&vc, "encoder", LIBAVFORMAT_IDENT) ;
 	if(*avfcontext->title)
 	    vorbis_comment_add_tag(&vc, "title", avfcontext->title) ;